diff --git a/INSTALL b/INSTALL
index e0339ee7ddf330b0a7a6a92f47fe1e91fea8d741..38a5bb3a37aeb4223b96d2bfbfdd52702321c527 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ INSTALLATION GUIDE
* CORE INSTALLATION
# Go to the root of the application core directory
- cd sflphone-common
+ cd daemon
# Compile pjsip
cd libs/pjproject
./autogen.sh
@@ -17,14 +17,14 @@ INSTALLATION GUIDE
* GNOME CLIENT INSTALLATION
# Go to the root of the gnome client directory
- cd sflphone-client-gnome
+ cd gnome
./autogen.sh --prefix=/usr
make && sudo make install
You are done with the gnome client !
Then, to start SFLphone, simply go in Applications > Internet > SFLphone VoIP Client.
-
+
Thanks You
SFLphone Team
diff --git a/README b/README
index 813ef6587442779b4da2043b36ab28ce40cdad9a..2c7a6ff53784588d6a5236ec5b02bdb6735371ec 100644
--- a/README
+++ b/README
@@ -4,8 +4,8 @@ GIT REPOSITORY
Tree information:
- * sflphone-common: contains the core application code. This code is mandatory to run the softphone. It may be considered as the core as it implements all the logic (audio layer, communication layer, account management, codecs management, dbus services).
- * sflphone-client-gnome: contains the GTK+ client for SFLphone. It will connect and communicate to the core application through D-Bus.
+ * daemon: contains the core application code. This code is mandatory to run the softphone. It may be considered as the core as it implements all the logic (audio layer, communication layer, account management, codecs management, dbus services).
+ * gnome: contains the GTK+ client for SFLphone. It will connect and communicate to the core application through D-Bus.
* tools: scripts
diff --git a/build_tarball.sh b/build_tarball.sh
index b1d0c8dee32384ee97aba641fb531fd19d1168b6..711210a9ba6dc046a288cc36d0f8ab342fa139f5 100755
--- a/build_tarball.sh
+++ b/build_tarball.sh
@@ -4,7 +4,7 @@
#
# Author: Francois Marier <francois@debian.org>
-if [ ! -e sflphone-common/configure.ac ] ; then
+if [ ! -e daemon/configure.ac ] ; then
echo "This script must be run in the root directory of the sflphone repository"
exit 1
fi
@@ -31,7 +31,7 @@ rm -f *.tar.gz
rm -rf lang/
rm -rf tools/
-rm -rf sflphone-client-kde/
+rm -rf kde/
rm -rf .git/
rm -f .gitignore
@@ -40,11 +40,11 @@ find -name .project -type f -exec rm {} \;
find -name .cproject -type f -exec rm {} \;
find -name .settings -type d -exec rm -rf {} \;
-pushd sflphone-common
+pushd daemon
./autogen.sh
popd
-pushd sflphone-common/libs/pjproject
+pushd daemon/libs/pjproject
find -name os-auto.mak -type f -exec rm {} \;
# Remove pre-built binaries
@@ -87,7 +87,7 @@ rm -rf third_party/milenage/
aclocal --force
popd
-pushd sflphone-client-gnome
+pushd gnome
./autogen.sh
popd
diff --git a/sflphone-common/.cproject b/daemon/.cproject
similarity index 100%
rename from sflphone-common/.cproject
rename to daemon/.cproject
diff --git a/sflphone-common/.project b/daemon/.project
similarity index 100%
rename from sflphone-common/.project
rename to daemon/.project
diff --git a/sflphone-common/AUTHORS b/daemon/AUTHORS
similarity index 100%
rename from sflphone-common/AUTHORS
rename to daemon/AUTHORS
diff --git a/sflphone-common/COPYING b/daemon/COPYING
similarity index 100%
rename from sflphone-common/COPYING
rename to daemon/COPYING
diff --git a/sflphone-common/ChangeLog b/daemon/ChangeLog
similarity index 100%
rename from sflphone-common/ChangeLog
rename to daemon/ChangeLog
diff --git a/sflphone-common/Makefile.am b/daemon/Makefile.am
similarity index 100%
rename from sflphone-common/Makefile.am
rename to daemon/Makefile.am
diff --git a/sflphone-common/NEWS b/daemon/NEWS
similarity index 100%
rename from sflphone-common/NEWS
rename to daemon/NEWS
diff --git a/sflphone-common/README b/daemon/README
similarity index 100%
rename from sflphone-common/README
rename to daemon/README
diff --git a/sflphone-common/README.gentoo b/daemon/README.gentoo
similarity index 100%
rename from sflphone-common/README.gentoo
rename to daemon/README.gentoo
diff --git a/sflphone-common/TODO b/daemon/TODO
similarity index 100%
rename from sflphone-common/TODO
rename to daemon/TODO
diff --git a/sflphone-client-gnome/VERSION b/daemon/VERSION
similarity index 100%
rename from sflphone-client-gnome/VERSION
rename to daemon/VERSION
diff --git a/sflphone-common/autogen.sh b/daemon/autogen.sh
similarity index 100%
rename from sflphone-common/autogen.sh
rename to daemon/autogen.sh
diff --git a/sflphone-common/ccccreports/cccc.xml b/daemon/ccccreports/cccc.xml
similarity index 100%
rename from sflphone-common/ccccreports/cccc.xml
rename to daemon/ccccreports/cccc.xml
diff --git a/sflphone-common/configure.ac b/daemon/configure.ac
similarity index 100%
rename from sflphone-common/configure.ac
rename to daemon/configure.ac
diff --git a/sflphone-common/doc/Makefile.am b/daemon/doc/Makefile.am
similarity index 100%
rename from sflphone-common/doc/Makefile.am
rename to daemon/doc/Makefile.am
diff --git a/sflphone-common/doc/README b/daemon/doc/README
similarity index 100%
rename from sflphone-common/doc/README
rename to daemon/doc/README
diff --git a/sflphone-common/doc/dbus-api/Makefile.am b/daemon/doc/dbus-api/Makefile.am
similarity index 100%
rename from sflphone-common/doc/dbus-api/Makefile.am
rename to daemon/doc/dbus-api/Makefile.am
diff --git a/sflphone-common/doc/dbus-api/README b/daemon/doc/dbus-api/README
similarity index 100%
rename from sflphone-common/doc/dbus-api/README
rename to daemon/doc/dbus-api/README
diff --git a/sflphone-common/doc/dbus-api/doc/templates/devhelp.devhelp2 b/daemon/doc/dbus-api/doc/templates/devhelp.devhelp2
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/devhelp.devhelp2
rename to daemon/doc/dbus-api/doc/templates/devhelp.devhelp2
diff --git a/sflphone-common/doc/dbus-api/doc/templates/errors.html b/daemon/doc/dbus-api/doc/templates/errors.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/errors.html
rename to daemon/doc/dbus-api/doc/templates/errors.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/fullindex.html b/daemon/doc/dbus-api/doc/templates/fullindex.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/fullindex.html
rename to daemon/doc/dbus-api/doc/templates/fullindex.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/generic-types.html b/daemon/doc/dbus-api/doc/templates/generic-types.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/generic-types.html
rename to daemon/doc/dbus-api/doc/templates/generic-types.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/index.html b/daemon/doc/dbus-api/doc/templates/index.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/index.html
rename to daemon/doc/dbus-api/doc/templates/index.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/interface.html b/daemon/doc/dbus-api/doc/templates/interface.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/interface.html
rename to daemon/doc/dbus-api/doc/templates/interface.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/interfaces.html b/daemon/doc/dbus-api/doc/templates/interfaces.html
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/interfaces.html
rename to daemon/doc/dbus-api/doc/templates/interfaces.html
diff --git a/sflphone-common/doc/dbus-api/doc/templates/style.css b/daemon/doc/dbus-api/doc/templates/style.css
similarity index 100%
rename from sflphone-common/doc/dbus-api/doc/templates/style.css
rename to daemon/doc/dbus-api/doc/templates/style.css
diff --git a/sflphone-common/doc/dbus-api/spec/all.xml b/daemon/doc/dbus-api/spec/all.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/all.xml
rename to daemon/doc/dbus-api/spec/all.xml
diff --git a/sflphone-common/doc/dbus-api/spec/callmanager-introspec.xml b/daemon/doc/dbus-api/spec/callmanager-introspec.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/callmanager-introspec.xml
rename to daemon/doc/dbus-api/spec/callmanager-introspec.xml
diff --git a/sflphone-common/doc/dbus-api/spec/configurationmanager-introspec.xml b/daemon/doc/dbus-api/spec/configurationmanager-introspec.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/configurationmanager-introspec.xml
rename to daemon/doc/dbus-api/spec/configurationmanager-introspec.xml
diff --git a/sflphone-common/doc/dbus-api/spec/errors.xml b/daemon/doc/dbus-api/spec/errors.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/errors.xml
rename to daemon/doc/dbus-api/spec/errors.xml
diff --git a/sflphone-common/doc/dbus-api/spec/generic-types.xml b/daemon/doc/dbus-api/spec/generic-types.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/generic-types.xml
rename to daemon/doc/dbus-api/spec/generic-types.xml
diff --git a/sflphone-common/doc/dbus-api/spec/instance-introspec.xml b/daemon/doc/dbus-api/spec/instance-introspec.xml
similarity index 100%
rename from sflphone-common/doc/dbus-api/spec/instance-introspec.xml
rename to daemon/doc/dbus-api/spec/instance-introspec.xml
diff --git a/sflphone-common/doc/dbus-api/tools/devhelp.xsl b/daemon/doc/dbus-api/tools/devhelp.xsl
similarity index 100%
rename from sflphone-common/doc/dbus-api/tools/devhelp.xsl
rename to daemon/doc/dbus-api/tools/devhelp.xsl
diff --git a/sflphone-common/doc/dbus-api/tools/doc-generator.py b/daemon/doc/dbus-api/tools/doc-generator.py
similarity index 100%
rename from sflphone-common/doc/dbus-api/tools/doc-generator.py
rename to daemon/doc/dbus-api/tools/doc-generator.py
diff --git a/sflphone-common/doc/dbus-api/tools/doc-generator.xsl b/daemon/doc/dbus-api/tools/doc-generator.xsl
similarity index 100%
rename from sflphone-common/doc/dbus-api/tools/doc-generator.xsl
rename to daemon/doc/dbus-api/tools/doc-generator.xsl
diff --git a/sflphone-common/doc/dbus-api/tools/specparser.py b/daemon/doc/dbus-api/tools/specparser.py
similarity index 100%
rename from sflphone-common/doc/dbus-api/tools/specparser.py
rename to daemon/doc/dbus-api/tools/specparser.py
diff --git a/sflphone-common/doc/dbus-api/tools/xincludator.py b/daemon/doc/dbus-api/tools/xincludator.py
similarity index 100%
rename from sflphone-common/doc/dbus-api/tools/xincludator.py
rename to daemon/doc/dbus-api/tools/xincludator.py
diff --git a/sflphone-common/doc/doxygen/Makefile.am b/daemon/doc/doxygen/Makefile.am
similarity index 100%
rename from sflphone-common/doc/doxygen/Makefile.am
rename to daemon/doc/doxygen/Makefile.am
diff --git a/sflphone-common/doc/doxygen/blank.html b/daemon/doc/doxygen/blank.html
similarity index 100%
rename from sflphone-common/doc/doxygen/blank.html
rename to daemon/doc/doxygen/blank.html
diff --git a/sflphone-common/doc/doxygen/core-doc.cfg.in b/daemon/doc/doxygen/core-doc.cfg.in
similarity index 100%
rename from sflphone-common/doc/doxygen/core-doc.cfg.in
rename to daemon/doc/doxygen/core-doc.cfg.in
diff --git a/sflphone-common/doc/doxygen/gtk-gui-doc.cfg.in b/daemon/doc/doxygen/gtk-gui-doc.cfg.in
similarity index 100%
rename from sflphone-common/doc/doxygen/gtk-gui-doc.cfg.in
rename to daemon/doc/doxygen/gtk-gui-doc.cfg.in
diff --git a/sflphone-common/doc/general_component_diagram.png b/daemon/doc/general_component_diagram.png
similarity index 100%
rename from sflphone-common/doc/general_component_diagram.png
rename to daemon/doc/general_component_diagram.png
diff --git a/sflphone-common/globals.mak b/daemon/globals.mak
similarity index 100%
rename from sflphone-common/globals.mak
rename to daemon/globals.mak
diff --git a/sflphone-common/images/logo_ico.png b/daemon/images/logo_ico.png
similarity index 100%
rename from sflphone-common/images/logo_ico.png
rename to daemon/images/logo_ico.png
diff --git a/sflphone-common/images/sfl-logo.png b/daemon/images/sfl-logo.png
similarity index 100%
rename from sflphone-common/images/sfl-logo.png
rename to daemon/images/sfl-logo.png
diff --git a/sflphone-common/images/sflphone.png b/daemon/images/sflphone.png
similarity index 100%
rename from sflphone-common/images/sflphone.png
rename to daemon/images/sflphone.png
diff --git a/sflphone-common/images/sflphone_logo.png b/daemon/images/sflphone_logo.png
similarity index 100%
rename from sflphone-common/images/sflphone_logo.png
rename to daemon/images/sflphone_logo.png
diff --git a/sflphone-common/images/tray-icon.png b/daemon/images/tray-icon.png
similarity index 100%
rename from sflphone-common/images/tray-icon.png
rename to daemon/images/tray-icon.png
diff --git a/sflphone-common/libs/Makefile.am b/daemon/libs/Makefile.am
similarity index 100%
rename from sflphone-common/libs/Makefile.am
rename to daemon/libs/Makefile.am
diff --git a/sflphone-common/libs/README.libiax2 b/daemon/libs/README.libiax2
similarity index 100%
rename from sflphone-common/libs/README.libiax2
rename to daemon/libs/README.libiax2
diff --git a/sflphone-client-gnome/AUTHORS b/daemon/libs/iax2/AUTHORS
similarity index 100%
rename from sflphone-client-gnome/AUTHORS
rename to daemon/libs/iax2/AUTHORS
diff --git a/sflphone-common/libs/iax2/COPYING b/daemon/libs/iax2/COPYING
similarity index 100%
rename from sflphone-common/libs/iax2/COPYING
rename to daemon/libs/iax2/COPYING
diff --git a/sflphone-common/libs/iax2/Makefile.am b/daemon/libs/iax2/Makefile.am
similarity index 100%
rename from sflphone-common/libs/iax2/Makefile.am
rename to daemon/libs/iax2/Makefile.am
diff --git a/sflphone-common/libs/iax2/answer.h b/daemon/libs/iax2/answer.h
similarity index 100%
rename from sflphone-common/libs/iax2/answer.h
rename to daemon/libs/iax2/answer.h
diff --git a/sflphone-common/libs/iax2/busy.h b/daemon/libs/iax2/busy.h
similarity index 100%
rename from sflphone-common/libs/iax2/busy.h
rename to daemon/libs/iax2/busy.h
diff --git a/sflphone-common/libs/iax2/dialtone.h b/daemon/libs/iax2/dialtone.h
similarity index 100%
rename from sflphone-common/libs/iax2/dialtone.h
rename to daemon/libs/iax2/dialtone.h
diff --git a/sflphone-common/libs/iax2/frame.h b/daemon/libs/iax2/frame.h
similarity index 100%
rename from sflphone-common/libs/iax2/frame.h
rename to daemon/libs/iax2/frame.h
diff --git a/sflphone-common/libs/iax2/iax-client.h b/daemon/libs/iax2/iax-client.h
similarity index 100%
rename from sflphone-common/libs/iax2/iax-client.h
rename to daemon/libs/iax2/iax-client.h
diff --git a/sflphone-common/libs/iax2/iax.c b/daemon/libs/iax2/iax.c
similarity index 100%
rename from sflphone-common/libs/iax2/iax.c
rename to daemon/libs/iax2/iax.c
diff --git a/sflphone-common/libs/iax2/iax.h b/daemon/libs/iax2/iax.h
similarity index 100%
rename from sflphone-common/libs/iax2/iax.h
rename to daemon/libs/iax2/iax.h
diff --git a/sflphone-common/libs/iax2/iax2-parser.c b/daemon/libs/iax2/iax2-parser.c
similarity index 100%
rename from sflphone-common/libs/iax2/iax2-parser.c
rename to daemon/libs/iax2/iax2-parser.c
diff --git a/sflphone-common/libs/iax2/iax2-parser.h b/daemon/libs/iax2/iax2-parser.h
similarity index 100%
rename from sflphone-common/libs/iax2/iax2-parser.h
rename to daemon/libs/iax2/iax2-parser.h
diff --git a/sflphone-common/libs/iax2/iax2.h b/daemon/libs/iax2/iax2.h
similarity index 100%
rename from sflphone-common/libs/iax2/iax2.h
rename to daemon/libs/iax2/iax2.h
diff --git a/sflphone-common/libs/iax2/jitterbuf.c b/daemon/libs/iax2/jitterbuf.c
similarity index 100%
rename from sflphone-common/libs/iax2/jitterbuf.c
rename to daemon/libs/iax2/jitterbuf.c
diff --git a/sflphone-common/libs/iax2/jitterbuf.h b/daemon/libs/iax2/jitterbuf.h
similarity index 100%
rename from sflphone-common/libs/iax2/jitterbuf.h
rename to daemon/libs/iax2/jitterbuf.h
diff --git a/sflphone-common/libs/iax2/md5.c b/daemon/libs/iax2/md5.c
similarity index 100%
rename from sflphone-common/libs/iax2/md5.c
rename to daemon/libs/iax2/md5.c
diff --git a/sflphone-common/libs/iax2/md5.h b/daemon/libs/iax2/md5.h
similarity index 100%
rename from sflphone-common/libs/iax2/md5.h
rename to daemon/libs/iax2/md5.h
diff --git a/sflphone-common/libs/iax2/miniphone.c b/daemon/libs/iax2/miniphone.c
similarity index 100%
rename from sflphone-common/libs/iax2/miniphone.c
rename to daemon/libs/iax2/miniphone.c
diff --git a/sflphone-common/libs/iax2/miniphone.h b/daemon/libs/iax2/miniphone.h
similarity index 100%
rename from sflphone-common/libs/iax2/miniphone.h
rename to daemon/libs/iax2/miniphone.h
diff --git a/sflphone-common/libs/iax2/options.c b/daemon/libs/iax2/options.c
similarity index 100%
rename from sflphone-common/libs/iax2/options.c
rename to daemon/libs/iax2/options.c
diff --git a/sflphone-common/libs/iax2/options.h b/daemon/libs/iax2/options.h
similarity index 100%
rename from sflphone-common/libs/iax2/options.h
rename to daemon/libs/iax2/options.h
diff --git a/sflphone-common/libs/iax2/ring10.h b/daemon/libs/iax2/ring10.h
similarity index 100%
rename from sflphone-common/libs/iax2/ring10.h
rename to daemon/libs/iax2/ring10.h
diff --git a/sflphone-common/libs/iax2/ringtone.h b/daemon/libs/iax2/ringtone.h
similarity index 100%
rename from sflphone-common/libs/iax2/ringtone.h
rename to daemon/libs/iax2/ringtone.h
diff --git a/sflphone-common/libs/iax2/winiphone.c b/daemon/libs/iax2/winiphone.c
similarity index 100%
rename from sflphone-common/libs/iax2/winiphone.c
rename to daemon/libs/iax2/winiphone.c
diff --git a/sflphone-common/libs/iax2/winpoop.h b/daemon/libs/iax2/winpoop.h
similarity index 100%
rename from sflphone-common/libs/iax2/winpoop.h
rename to daemon/libs/iax2/winpoop.h
diff --git a/sflphone-common/libs/pjproject/COPYING b/daemon/libs/pjproject/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject/COPYING
rename to daemon/libs/pjproject/COPYING
diff --git a/sflphone-common/libs/pjproject/INSTALL.txt b/daemon/libs/pjproject/INSTALL.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/INSTALL.txt
rename to daemon/libs/pjproject/INSTALL.txt
diff --git a/sflphone-common/libs/pjproject/Makefile b/daemon/libs/pjproject/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/Makefile
rename to daemon/libs/pjproject/Makefile
diff --git a/sflphone-common/libs/pjproject/README-RTEMS b/daemon/libs/pjproject/README-RTEMS
similarity index 100%
rename from sflphone-common/libs/pjproject/README-RTEMS
rename to daemon/libs/pjproject/README-RTEMS
diff --git a/sflphone-common/libs/pjproject/README.txt b/daemon/libs/pjproject/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/README.txt
rename to daemon/libs/pjproject/README.txt
diff --git a/sflphone-common/libs/pjproject/aconfigure b/daemon/libs/pjproject/aconfigure
similarity index 100%
rename from sflphone-common/libs/pjproject/aconfigure
rename to daemon/libs/pjproject/aconfigure
diff --git a/sflphone-common/libs/pjproject/aconfigure.ac b/daemon/libs/pjproject/aconfigure.ac
similarity index 100%
rename from sflphone-common/libs/pjproject/aconfigure.ac
rename to daemon/libs/pjproject/aconfigure.ac
diff --git a/sflphone-common/libs/pjproject/autogen.sh b/daemon/libs/pjproject/autogen.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/autogen.sh
rename to daemon/libs/pjproject/autogen.sh
diff --git a/sflphone-common/libs/pjproject/build.mak.in b/daemon/libs/pjproject/build.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/build.mak.in
rename to daemon/libs/pjproject/build.mak.in
diff --git a/sflphone-common/libs/pjproject/build.symbian/00.bat b/daemon/libs/pjproject/build.symbian/00.bat
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/00.bat
rename to daemon/libs/pjproject/build.symbian/00.bat
diff --git a/sflphone-common/libs/pjproject/build.symbian/01.bat b/daemon/libs/pjproject/build.symbian/01.bat
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/01.bat
rename to daemon/libs/pjproject/build.symbian/01.bat
diff --git a/sflphone-common/libs/pjproject/build.symbian/bld.inf b/daemon/libs/pjproject/build.symbian/bld.inf
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/bld.inf
rename to daemon/libs/pjproject/build.symbian/bld.inf
diff --git a/sflphone-common/libs/pjproject/build.symbian/libg7221codec.mmp b/daemon/libs/pjproject/build.symbian/libg7221codec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libg7221codec.mmp
rename to daemon/libs/pjproject/build.symbian/libg7221codec.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/libgsmcodec.mmp b/daemon/libs/pjproject/build.symbian/libgsmcodec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libgsmcodec.mmp
rename to daemon/libs/pjproject/build.symbian/libgsmcodec.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/libpassthroughcodec.mmp b/daemon/libs/pjproject/build.symbian/libpassthroughcodec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libpassthroughcodec.mmp
rename to daemon/libs/pjproject/build.symbian/libpassthroughcodec.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/libresample.mmp b/daemon/libs/pjproject/build.symbian/libresample.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libresample.mmp
rename to daemon/libs/pjproject/build.symbian/libresample.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/libspeexcodec.mmp b/daemon/libs/pjproject/build.symbian/libspeexcodec.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libspeexcodec.mmp
rename to daemon/libs/pjproject/build.symbian/libspeexcodec.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/libsrtp.mmp b/daemon/libs/pjproject/build.symbian/libsrtp.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/libsrtp.mmp
rename to daemon/libs/pjproject/build.symbian/libsrtp.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/makedef.sh b/daemon/libs/pjproject/build.symbian/makedef.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/makedef.sh
rename to daemon/libs/pjproject/build.symbian/makedef.sh
diff --git a/sflphone-common/libs/pjproject/build.symbian/null_audio.mmp b/daemon/libs/pjproject/build.symbian/null_audio.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/null_audio.mmp
rename to daemon/libs/pjproject/build.symbian/null_audio.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/null_audioU.def b/daemon/libs/pjproject/build.symbian/null_audioU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/null_audioU.def
rename to daemon/libs/pjproject/build.symbian/null_audioU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlib.mmp b/daemon/libs/pjproject/build.symbian/pjlib.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlib.mmp
rename to daemon/libs/pjproject/build.symbian/pjlib.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlibU.def b/daemon/libs/pjproject/build.symbian/pjlibU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlibU.def
rename to daemon/libs/pjproject/build.symbian/pjlibU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlib_test.mmp b/daemon/libs/pjproject/build.symbian/pjlib_test.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlib_test.mmp
rename to daemon/libs/pjproject/build.symbian/pjlib_test.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlib_test.pkg b/daemon/libs/pjproject/build.symbian/pjlib_test.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlib_test.pkg
rename to daemon/libs/pjproject/build.symbian/pjlib_test.pkg
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlib_util.mmp b/daemon/libs/pjproject/build.symbian/pjlib_util.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlib_util.mmp
rename to daemon/libs/pjproject/build.symbian/pjlib_util.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjlib_utilU.def b/daemon/libs/pjproject/build.symbian/pjlib_utilU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjlib_utilU.def
rename to daemon/libs/pjproject/build.symbian/pjlib_utilU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjmedia.mmp b/daemon/libs/pjproject/build.symbian/pjmedia.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjmedia.mmp
rename to daemon/libs/pjproject/build.symbian/pjmedia.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjmediaU.def b/daemon/libs/pjproject/build.symbian/pjmediaU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjmediaU.def
rename to daemon/libs/pjproject/build.symbian/pjmediaU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjmedia_audiodev.mmp b/daemon/libs/pjproject/build.symbian/pjmedia_audiodev.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjmedia_audiodev.mmp
rename to daemon/libs/pjproject/build.symbian/pjmedia_audiodev.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjnath.mmp b/daemon/libs/pjproject/build.symbian/pjnath.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjnath.mmp
rename to daemon/libs/pjproject/build.symbian/pjnath.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjnathU.def b/daemon/libs/pjproject/build.symbian/pjnathU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjnathU.def
rename to daemon/libs/pjproject/build.symbian/pjnathU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjproject.cww b/daemon/libs/pjproject/build.symbian/pjproject.cww
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjproject.cww
rename to daemon/libs/pjproject/build.symbian/pjproject.cww
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsdp.mmp b/daemon/libs/pjproject/build.symbian/pjsdp.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsdp.mmp
rename to daemon/libs/pjproject/build.symbian/pjsdp.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsdpU.def b/daemon/libs/pjproject/build.symbian/pjsdpU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsdpU.def
rename to daemon/libs/pjproject/build.symbian/pjsdpU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsip.mmp b/daemon/libs/pjproject/build.symbian/pjsip.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsip.mmp
rename to daemon/libs/pjproject/build.symbian/pjsip.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsipU.def b/daemon/libs/pjproject/build.symbian/pjsipU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsipU.def
rename to daemon/libs/pjproject/build.symbian/pjsipU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsip_simple.mmp b/daemon/libs/pjproject/build.symbian/pjsip_simple.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsip_simple.mmp
rename to daemon/libs/pjproject/build.symbian/pjsip_simple.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsip_simpleU.def b/daemon/libs/pjproject/build.symbian/pjsip_simpleU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsip_simpleU.def
rename to daemon/libs/pjproject/build.symbian/pjsip_simpleU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsip_ua.mmp b/daemon/libs/pjproject/build.symbian/pjsip_ua.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsip_ua.mmp
rename to daemon/libs/pjproject/build.symbian/pjsip_ua.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsip_uaU.def b/daemon/libs/pjproject/build.symbian/pjsip_uaU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsip_uaU.def
rename to daemon/libs/pjproject/build.symbian/pjsip_uaU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjstun_client.mmp b/daemon/libs/pjproject/build.symbian/pjstun_client.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjstun_client.mmp
rename to daemon/libs/pjproject/build.symbian/pjstun_client.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsua_lib.mmp b/daemon/libs/pjproject/build.symbian/pjsua_lib.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsua_lib.mmp
rename to daemon/libs/pjproject/build.symbian/pjsua_lib.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/pjsua_libU.def b/daemon/libs/pjproject/build.symbian/pjsua_libU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/pjsua_libU.def
rename to daemon/libs/pjproject/build.symbian/pjsua_libU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_audio.mmp b/daemon/libs/pjproject/build.symbian/symbian_audio.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_audio.mmp
rename to daemon/libs/pjproject/build.symbian/symbian_audio.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_audioU.def b/daemon/libs/pjproject/build.symbian/symbian_audioU.def
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_audioU.def
rename to daemon/libs/pjproject/build.symbian/symbian_audioU.def
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_ua.mmp b/daemon/libs/pjproject/build.symbian/symbian_ua.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_ua.mmp
rename to daemon/libs/pjproject/build.symbian/symbian_ua.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_ua.pkg b/daemon/libs/pjproject/build.symbian/symbian_ua.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_ua.pkg
rename to daemon/libs/pjproject/build.symbian/symbian_ua.pkg
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_ua_udeb.pkg b/daemon/libs/pjproject/build.symbian/symbian_ua_udeb.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_ua_udeb.pkg
rename to daemon/libs/pjproject/build.symbian/symbian_ua_udeb.pkg
diff --git a/sflphone-common/libs/pjproject/build.symbian/symbian_ua_urel.pkg b/daemon/libs/pjproject/build.symbian/symbian_ua_urel.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symbian_ua_urel.pkg
rename to daemon/libs/pjproject/build.symbian/symbian_ua_urel.pkg
diff --git a/sflphone-common/libs/pjproject/build.symbian/symsndtest.mmp b/daemon/libs/pjproject/build.symbian/symsndtest.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symsndtest.mmp
rename to daemon/libs/pjproject/build.symbian/symsndtest.mmp
diff --git a/sflphone-common/libs/pjproject/build.symbian/symsndtest.pkg b/daemon/libs/pjproject/build.symbian/symsndtest.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/build.symbian/symsndtest.pkg
rename to daemon/libs/pjproject/build.symbian/symsndtest.pkg
diff --git a/sflphone-common/libs/pjproject/build/cc-gcc.mak b/daemon/libs/pjproject/build/cc-gcc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/cc-gcc.mak
rename to daemon/libs/pjproject/build/cc-gcc.mak
diff --git a/sflphone-common/libs/pjproject/build/cc-vc.mak b/daemon/libs/pjproject/build/cc-vc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/cc-vc.mak
rename to daemon/libs/pjproject/build/cc-vc.mak
diff --git a/sflphone-common/libs/pjproject/build/common.mak b/daemon/libs/pjproject/build/common.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/common.mak
rename to daemon/libs/pjproject/build/common.mak
diff --git a/sflphone-common/libs/pjproject/build/host-mingw.mak b/daemon/libs/pjproject/build/host-mingw.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/host-mingw.mak
rename to daemon/libs/pjproject/build/host-mingw.mak
diff --git a/sflphone-common/libs/pjproject/build/host-unix.mak b/daemon/libs/pjproject/build/host-unix.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/host-unix.mak
rename to daemon/libs/pjproject/build/host-unix.mak
diff --git a/sflphone-common/libs/pjproject/build/host-win32.mak b/daemon/libs/pjproject/build/host-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/host-win32.mak
rename to daemon/libs/pjproject/build/host-win32.mak
diff --git a/sflphone-common/libs/pjproject/build/m-alpha.mak b/daemon/libs/pjproject/build/m-alpha.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-alpha.mak
rename to daemon/libs/pjproject/build/m-alpha.mak
diff --git a/sflphone-common/libs/pjproject/build/m-arm.mak b/daemon/libs/pjproject/build/m-arm.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-arm.mak
rename to daemon/libs/pjproject/build/m-arm.mak
diff --git a/sflphone-common/libs/pjproject/build/m-auto.mak b/daemon/libs/pjproject/build/m-auto.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-auto.mak
rename to daemon/libs/pjproject/build/m-auto.mak
diff --git a/sflphone-common/libs/pjproject/build/m-i386.mak b/daemon/libs/pjproject/build/m-i386.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-i386.mak
rename to daemon/libs/pjproject/build/m-i386.mak
diff --git a/sflphone-common/libs/pjproject/build/m-m68k.mak b/daemon/libs/pjproject/build/m-m68k.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-m68k.mak
rename to daemon/libs/pjproject/build/m-m68k.mak
diff --git a/sflphone-common/libs/pjproject/build/m-mpc860.mak b/daemon/libs/pjproject/build/m-mpc860.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-mpc860.mak
rename to daemon/libs/pjproject/build/m-mpc860.mak
diff --git a/sflphone-common/libs/pjproject/build/m-powerpc.mak b/daemon/libs/pjproject/build/m-powerpc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-powerpc.mak
rename to daemon/libs/pjproject/build/m-powerpc.mak
diff --git a/sflphone-common/libs/pjproject/build/m-sparc.mak b/daemon/libs/pjproject/build/m-sparc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-sparc.mak
rename to daemon/libs/pjproject/build/m-sparc.mak
diff --git a/sflphone-common/libs/pjproject/build/m-x86_64.mak b/daemon/libs/pjproject/build/m-x86_64.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/m-x86_64.mak
rename to daemon/libs/pjproject/build/m-x86_64.mak
diff --git a/sflphone-common/libs/pjproject/build/os-auto.mak.in b/daemon/libs/pjproject/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-auto.mak.in
rename to daemon/libs/pjproject/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/build/os-darwinos.mak b/daemon/libs/pjproject/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-darwinos.mak
rename to daemon/libs/pjproject/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject/build/os-linux-kernel.mak b/daemon/libs/pjproject/build/os-linux-kernel.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-linux-kernel.mak
rename to daemon/libs/pjproject/build/os-linux-kernel.mak
diff --git a/sflphone-common/libs/pjproject/build/os-linux.mak b/daemon/libs/pjproject/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-linux.mak
rename to daemon/libs/pjproject/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject/build/os-palmos.mak b/daemon/libs/pjproject/build/os-palmos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-palmos.mak
rename to daemon/libs/pjproject/build/os-palmos.mak
diff --git a/sflphone-common/libs/pjproject/build/os-rtems.mak b/daemon/libs/pjproject/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-rtems.mak
rename to daemon/libs/pjproject/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject/build/os-sunos.mak b/daemon/libs/pjproject/build/os-sunos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-sunos.mak
rename to daemon/libs/pjproject/build/os-sunos.mak
diff --git a/sflphone-common/libs/pjproject/build/os-win32.mak b/daemon/libs/pjproject/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/os-win32.mak
rename to daemon/libs/pjproject/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject/build/rules.mak b/daemon/libs/pjproject/build/rules.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/build/rules.mak
rename to daemon/libs/pjproject/build/rules.mak
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-common-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-debug-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-debug-static-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-release-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-release-static-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-win32-common-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-win32-release-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm2003-common-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm2003-release-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm5-common-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm5-release-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops b/daemon/libs/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
similarity index 100%
rename from sflphone-common/libs/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
rename to daemon/libs/pjproject/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
diff --git a/sflphone-common/libs/pjproject/c++-build.mak b/daemon/libs/pjproject/c++-build.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/c++-build.mak
rename to daemon/libs/pjproject/c++-build.mak
diff --git a/sflphone-common/libs/pjproject/config.guess b/daemon/libs/pjproject/config.guess
similarity index 100%
rename from sflphone-common/libs/pjproject/config.guess
rename to daemon/libs/pjproject/config.guess
diff --git a/sflphone-common/libs/pjproject/config.sub b/daemon/libs/pjproject/config.sub
similarity index 100%
rename from sflphone-common/libs/pjproject/config.sub
rename to daemon/libs/pjproject/config.sub
diff --git a/sflphone-common/libs/pjproject/configure b/daemon/libs/pjproject/configure
similarity index 100%
rename from sflphone-common/libs/pjproject/configure
rename to daemon/libs/pjproject/configure
diff --git a/sflphone-common/libs/pjproject/configure-legacy b/daemon/libs/pjproject/configure-legacy
similarity index 100%
rename from sflphone-common/libs/pjproject/configure-legacy
rename to daemon/libs/pjproject/configure-legacy
diff --git a/sflphone-common/libs/pjproject/install-sh b/daemon/libs/pjproject/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject/install-sh
rename to daemon/libs/pjproject/install-sh
diff --git a/sflphone-common/libs/pjproject/libpj.pc.in b/daemon/libs/pjproject/libpj.pc.in
similarity index 100%
rename from sflphone-common/libs/pjproject/libpj.pc.in
rename to daemon/libs/pjproject/libpj.pc.in
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/Makefile b/daemon/libs/pjproject/pjlib-util/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/Makefile
rename to daemon/libs/pjproject/pjlib-util/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/os-auto.mak.in b/daemon/libs/pjproject/pjlib-util/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/os-auto.mak.in
rename to daemon/libs/pjproject/pjlib-util/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/os-rtems.mak b/daemon/libs/pjproject/pjlib-util/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/os-rtems.mak
rename to daemon/libs/pjproject/pjlib-util/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.dsp b/daemon/libs/pjproject/pjlib-util/build/pjlib_util.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.dsp
rename to daemon/libs/pjproject/pjlib-util/build/pjlib_util.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.dsw b/daemon/libs/pjproject/pjlib-util/build/pjlib_util.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.dsw
rename to daemon/libs/pjproject/pjlib-util/build/pjlib_util.dsw
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.vcproj b/daemon/libs/pjproject/pjlib-util/build/pjlib_util.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util.vcproj
rename to daemon/libs/pjproject/pjlib-util/build/pjlib_util.vcproj
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util_test.dsp b/daemon/libs/pjproject/pjlib-util/build/pjlib_util_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util_test.dsp
rename to daemon/libs/pjproject/pjlib-util/build/pjlib_util_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util_test.vcproj b/daemon/libs/pjproject/pjlib-util/build/pjlib_util_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/pjlib_util_test.vcproj
rename to daemon/libs/pjproject/pjlib-util/build/pjlib_util_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp b/daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
rename to daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp b/daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
rename to daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw b/daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
rename to daemon/libs/pjproject/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw
diff --git a/sflphone-common/libs/pjproject/pjlib-util/docs/doxygen.cfg b/daemon/libs/pjproject/pjlib-util/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/docs/doxygen.cfg
rename to daemon/libs/pjproject/pjlib-util/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject/pjlib-util/docs/doxygen.css b/daemon/libs/pjproject/pjlib-util/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/docs/doxygen.css
rename to daemon/libs/pjproject/pjlib-util/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject/pjlib-util/docs/footer.html b/daemon/libs/pjproject/pjlib-util/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/docs/footer.html
rename to daemon/libs/pjproject/pjlib-util/docs/footer.html
diff --git a/sflphone-common/libs/pjproject/pjlib-util/docs/header.html b/daemon/libs/pjproject/pjlib-util/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/docs/header.html
rename to daemon/libs/pjproject/pjlib-util/docs/header.html
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/base64.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/config.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/crc32.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/dns.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/dns_server.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/errno.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/getopt.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/getopt.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/getopt.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/getopt.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/hmac_md5.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/hmac_sha1.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/md5.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/pcap.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/resolver.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/scanner_cis_uint.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/sha1.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/string.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/string.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/stun_simple.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/types.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/types.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h b/daemon/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
rename to daemon/libs/pjproject/pjlib-util/include/pjlib-util/xml.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/encryption.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main_rtems.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main_rtems.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main_rtems.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main_win32.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/main_win32.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/stun.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/test.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/test.h
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util-test/xml.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/base64.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/crc32.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/crc32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/crc32.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/crc32.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns_dump.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/dns_server.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/errno.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/getopt.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/hmac_md5.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/hmac_sha1.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/md5.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/md5.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/md5.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/md5.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/pcap.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/resolver.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/scanner_cis_uint.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/sha1.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/sha1.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/sha1.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/sha1.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/srv_resolver.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/string.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/string.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/stun_simple_client.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/symbols.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/xml.c
diff --git a/sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp b/daemon/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
rename to daemon/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/Makefile b/daemon/libs/pjproject/pjlib/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/Makefile
rename to daemon/libs/pjproject/pjlib/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjlib/build/cacert.pem b/daemon/libs/pjproject/pjlib/build/cacert.pem
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/cacert.pem
rename to daemon/libs/pjproject/pjlib/build/cacert.pem
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak.in b/daemon/libs/pjproject/pjlib/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-auto.mak.in
rename to daemon/libs/pjproject/pjlib/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-darwinos.mak b/daemon/libs/pjproject/pjlib/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-darwinos.mak
rename to daemon/libs/pjproject/pjlib/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-linux-kernel.mak b/daemon/libs/pjproject/pjlib/build/os-linux-kernel.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-linux-kernel.mak
rename to daemon/libs/pjproject/pjlib/build/os-linux-kernel.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-linux.mak b/daemon/libs/pjproject/pjlib/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-linux.mak
rename to daemon/libs/pjproject/pjlib/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-rtems.mak b/daemon/libs/pjproject/pjlib/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-rtems.mak
rename to daemon/libs/pjproject/pjlib/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-sunos.mak b/daemon/libs/pjproject/pjlib/build/os-sunos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-sunos.mak
rename to daemon/libs/pjproject/pjlib/build/os-sunos.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-win32.mak b/daemon/libs/pjproject/pjlib/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/os-win32.mak
rename to daemon/libs/pjproject/pjlib/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib++-test.dsp b/daemon/libs/pjproject/pjlib/build/pjlib++-test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib++-test.dsp
rename to daemon/libs/pjproject/pjlib/build/pjlib++-test.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib++.dsp b/daemon/libs/pjproject/pjlib/build/pjlib++.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib++.dsp
rename to daemon/libs/pjproject/pjlib/build/pjlib++.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib.dsp b/daemon/libs/pjproject/pjlib/build/pjlib.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib.dsp
rename to daemon/libs/pjproject/pjlib/build/pjlib.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib.dsw b/daemon/libs/pjproject/pjlib/build/pjlib.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib.dsw
rename to daemon/libs/pjproject/pjlib/build/pjlib.dsw
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib.vcproj b/daemon/libs/pjproject/pjlib/build/pjlib.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib.vcproj
rename to daemon/libs/pjproject/pjlib/build/pjlib.vcproj
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib_samples.dsp b/daemon/libs/pjproject/pjlib/build/pjlib_samples.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib_samples.dsp
rename to daemon/libs/pjproject/pjlib/build/pjlib_samples.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib_samples.mak b/daemon/libs/pjproject/pjlib/build/pjlib_samples.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib_samples.mak
rename to daemon/libs/pjproject/pjlib/build/pjlib_samples.mak
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib_test.dsp b/daemon/libs/pjproject/pjlib/build/pjlib_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib_test.dsp
rename to daemon/libs/pjproject/pjlib/build/pjlib_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/pjlib_test.vcproj b/daemon/libs/pjproject/pjlib/build/pjlib_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/pjlib_test.vcproj
rename to daemon/libs/pjproject/pjlib/build/pjlib_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjlib/build/privkey.pem b/daemon/libs/pjproject/pjlib/build/privkey.pem
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/privkey.pem
rename to daemon/libs/pjproject/pjlib/build/privkey.pem
diff --git a/sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_test_wince.vcp b/daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_test_wince.vcp
rename to daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcp b/daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcp
rename to daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcw b/daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcw
rename to daemon/libs/pjproject/pjlib/build/wince-evc4/pjlib_wince.vcw
diff --git a/sflphone-common/libs/pjproject/pjlib/docs/doxygen.cfg b/daemon/libs/pjproject/pjlib/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/docs/doxygen.cfg
rename to daemon/libs/pjproject/pjlib/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject/pjlib/docs/doxygen.css b/daemon/libs/pjproject/pjlib/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/docs/doxygen.css
rename to daemon/libs/pjproject/pjlib/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject/pjlib/docs/footer.html b/daemon/libs/pjproject/pjlib/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/docs/footer.html
rename to daemon/libs/pjproject/pjlib/docs/footer.html
diff --git a/sflphone-common/libs/pjproject/pjlib/docs/header.html b/daemon/libs/pjproject/pjlib/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/docs/header.html
rename to daemon/libs/pjproject/pjlib/docs/header.html
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp b/daemon/libs/pjproject/pjlib/include/pj++/file.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/file.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/file.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp b/daemon/libs/pjproject/pjlib/include/pj++/hash.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/hash.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/hash.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp b/daemon/libs/pjproject/pjlib/include/pj++/list.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/list.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/list.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp b/daemon/libs/pjproject/pjlib/include/pj++/lock.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/lock.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/lock.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp b/daemon/libs/pjproject/pjlib/include/pj++/os.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/os.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/os.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp b/daemon/libs/pjproject/pjlib/include/pj++/pool.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/pool.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/pool.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp b/daemon/libs/pjproject/pjlib/include/pj++/proactor.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/proactor.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/proactor.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp b/daemon/libs/pjproject/pjlib/include/pj++/scanner.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/scanner.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/scanner.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp b/daemon/libs/pjproject/pjlib/include/pj++/sock.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/sock.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/sock.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp b/daemon/libs/pjproject/pjlib/include/pj++/string.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/string.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/string.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp b/daemon/libs/pjproject/pjlib/include/pj++/timer.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/timer.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/timer.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp b/daemon/libs/pjproject/pjlib/include/pj++/tree.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/tree.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/tree.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp b/daemon/libs/pjproject/pjlib/include/pj++/types.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj++/types.hpp
rename to daemon/libs/pjproject/pjlib/include/pj++/types.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h b/daemon/libs/pjproject/pjlib/include/pj/activesock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/activesock.h
rename to daemon/libs/pjproject/pjlib/include/pj/activesock.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h b/daemon/libs/pjproject/pjlib/include/pj/addr_resolv.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/addr_resolv.h
rename to daemon/libs/pjproject/pjlib/include/pj/addr_resolv.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/array.h b/daemon/libs/pjproject/pjlib/include/pj/array.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/array.h
rename to daemon/libs/pjproject/pjlib/include/pj/array.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/assert.h b/daemon/libs/pjproject/pjlib/include/pj/assert.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/assert.h
rename to daemon/libs/pjproject/pjlib/include/pj/assert.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h b/daemon/libs/pjproject/pjlib/include/pj/compat/assert.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/assert.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/assert.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_armcc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_codew.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_gcc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_gcce.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_msvc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/cc_mwcc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h b/daemon/libs/pjproject/pjlib/include/pj/compat/ctype.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/ctype.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/ctype.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h b/daemon/libs/pjproject/pjlib/include/pj/compat/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/errno.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/errno.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h b/daemon/libs/pjproject/pjlib/include/pj/compat/high_precision.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/high_precision.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/high_precision.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_alpha.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_armv4.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in b/daemon/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_auto.h.in
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_i386.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_i386.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_i386.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_m68k.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_powerpc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_sparc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h b/daemon/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/m_x86_64.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h b/daemon/libs/pjproject/pjlib/include/pj/compat/malloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/malloc.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/malloc.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in b/daemon/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_auto.h.in
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_darwinos.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_linux.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_linux.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_linux_kernel.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_palmos.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_rtems.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_sunos.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_symbian.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_win32.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_win32.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h b/daemon/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/os_win32_wince.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h b/daemon/libs/pjproject/pjlib/include/pj/compat/rand.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/rand.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/rand.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h b/daemon/libs/pjproject/pjlib/include/pj/compat/setjmp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/setjmp.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/setjmp.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h b/daemon/libs/pjproject/pjlib/include/pj/compat/size_t.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/size_t.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/size_t.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h b/daemon/libs/pjproject/pjlib/include/pj/compat/socket.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/socket.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/socket.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h b/daemon/libs/pjproject/pjlib/include/pj/compat/stdarg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdarg.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/stdarg.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h b/daemon/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/stdfileio.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h b/daemon/libs/pjproject/pjlib/include/pj/compat/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/string.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h b/daemon/libs/pjproject/pjlib/include/pj/compat/time.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/compat/time.h
rename to daemon/libs/pjproject/pjlib/include/pj/compat/time.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/config.h b/daemon/libs/pjproject/pjlib/include/pj/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/config.h
rename to daemon/libs/pjproject/pjlib/include/pj/config.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/config_site_sample.h b/daemon/libs/pjproject/pjlib/include/pj/config_site_sample.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/config_site_sample.h
rename to daemon/libs/pjproject/pjlib/include/pj/config_site_sample.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h b/daemon/libs/pjproject/pjlib/include/pj/ctype.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/ctype.h
rename to daemon/libs/pjproject/pjlib/include/pj/ctype.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h b/daemon/libs/pjproject/pjlib/include/pj/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/doxygen.h
rename to daemon/libs/pjproject/pjlib/include/pj/doxygen.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/errno.h b/daemon/libs/pjproject/pjlib/include/pj/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/errno.h
rename to daemon/libs/pjproject/pjlib/include/pj/errno.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/except.h b/daemon/libs/pjproject/pjlib/include/pj/except.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/except.h
rename to daemon/libs/pjproject/pjlib/include/pj/except.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h b/daemon/libs/pjproject/pjlib/include/pj/fifobuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/fifobuf.h
rename to daemon/libs/pjproject/pjlib/include/pj/fifobuf.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h b/daemon/libs/pjproject/pjlib/include/pj/file_access.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/file_access.h
rename to daemon/libs/pjproject/pjlib/include/pj/file_access.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h b/daemon/libs/pjproject/pjlib/include/pj/file_io.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/file_io.h
rename to daemon/libs/pjproject/pjlib/include/pj/file_io.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/guid.h b/daemon/libs/pjproject/pjlib/include/pj/guid.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/guid.h
rename to daemon/libs/pjproject/pjlib/include/pj/guid.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/hash.h b/daemon/libs/pjproject/pjlib/include/pj/hash.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/hash.h
rename to daemon/libs/pjproject/pjlib/include/pj/hash.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ioqueue.h b/daemon/libs/pjproject/pjlib/include/pj/ioqueue.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/ioqueue.h
rename to daemon/libs/pjproject/pjlib/include/pj/ioqueue.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h b/daemon/libs/pjproject/pjlib/include/pj/ip_helper.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/ip_helper.h
rename to daemon/libs/pjproject/pjlib/include/pj/ip_helper.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/list.h b/daemon/libs/pjproject/pjlib/include/pj/list.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/list.h
rename to daemon/libs/pjproject/pjlib/include/pj/list.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h b/daemon/libs/pjproject/pjlib/include/pj/list_i.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/list_i.h
rename to daemon/libs/pjproject/pjlib/include/pj/list_i.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/lock.h b/daemon/libs/pjproject/pjlib/include/pj/lock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/lock.h
rename to daemon/libs/pjproject/pjlib/include/pj/lock.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/log.h b/daemon/libs/pjproject/pjlib/include/pj/log.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/log.h
rename to daemon/libs/pjproject/pjlib/include/pj/log.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/math.h b/daemon/libs/pjproject/pjlib/include/pj/math.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/math.h
rename to daemon/libs/pjproject/pjlib/include/pj/math.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/os.h b/daemon/libs/pjproject/pjlib/include/pj/os.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/os.h
rename to daemon/libs/pjproject/pjlib/include/pj/os.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool.h b/daemon/libs/pjproject/pjlib/include/pj/pool.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/pool.h
rename to daemon/libs/pjproject/pjlib/include/pj/pool.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h b/daemon/libs/pjproject/pjlib/include/pj/pool_alt.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/pool_alt.h
rename to daemon/libs/pjproject/pjlib/include/pj/pool_alt.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h b/daemon/libs/pjproject/pjlib/include/pj/pool_buf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/pool_buf.h
rename to daemon/libs/pjproject/pjlib/include/pj/pool_buf.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h b/daemon/libs/pjproject/pjlib/include/pj/pool_i.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/pool_i.h
rename to daemon/libs/pjproject/pjlib/include/pj/pool_i.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/rand.h b/daemon/libs/pjproject/pjlib/include/pj/rand.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/rand.h
rename to daemon/libs/pjproject/pjlib/include/pj/rand.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h b/daemon/libs/pjproject/pjlib/include/pj/rbtree.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/rbtree.h
rename to daemon/libs/pjproject/pjlib/include/pj/rbtree.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock.h b/daemon/libs/pjproject/pjlib/include/pj/sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/sock.h
rename to daemon/libs/pjproject/pjlib/include/pj/sock.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h b/daemon/libs/pjproject/pjlib/include/pj/sock_qos.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/sock_qos.h
rename to daemon/libs/pjproject/pjlib/include/pj/sock_qos.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h b/daemon/libs/pjproject/pjlib/include/pj/sock_select.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/sock_select.h
rename to daemon/libs/pjproject/pjlib/include/pj/sock_select.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h b/daemon/libs/pjproject/pjlib/include/pj/ssl_sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/ssl_sock.h
rename to daemon/libs/pjproject/pjlib/include/pj/ssl_sock.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/string.h b/daemon/libs/pjproject/pjlib/include/pj/string.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/string.h
rename to daemon/libs/pjproject/pjlib/include/pj/string.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h b/daemon/libs/pjproject/pjlib/include/pj/string_i.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/string_i.h
rename to daemon/libs/pjproject/pjlib/include/pj/string_i.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/timer.h b/daemon/libs/pjproject/pjlib/include/pj/timer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/timer.h
rename to daemon/libs/pjproject/pjlib/include/pj/timer.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/types.h b/daemon/libs/pjproject/pjlib/include/pj/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/types.h
rename to daemon/libs/pjproject/pjlib/include/pj/types.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h b/daemon/libs/pjproject/pjlib/include/pj/unicode.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pj/unicode.h
rename to daemon/libs/pjproject/pjlib/include/pj/unicode.h
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp b/daemon/libs/pjproject/pjlib/include/pjlib++.hpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pjlib++.hpp
rename to daemon/libs/pjproject/pjlib/include/pjlib++.hpp
diff --git a/sflphone-common/libs/pjproject/pjlib/include/pjlib.h b/daemon/libs/pjproject/pjlib/include/pjlib.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/include/pjlib.h
rename to daemon/libs/pjproject/pjlib/include/pjlib.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c b/daemon/libs/pjproject/pjlib/src/pj/activesock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/activesock.c
rename to daemon/libs/pjproject/pjlib/src/pj/activesock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/addr_resolv_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c b/daemon/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
rename to daemon/libs/pjproject/pjlib/src/pj/addr_resolv_sock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/array.c b/daemon/libs/pjproject/pjlib/src/pj/array.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/array.c
rename to daemon/libs/pjproject/pjlib/src/pj/array.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/longjmp_i386.S b/daemon/libs/pjproject/pjlib/src/pj/compat/longjmp_i386.S
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/compat/longjmp_i386.S
rename to daemon/libs/pjproject/pjlib/src/pj/compat/longjmp_i386.S
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/setjmp_i386.S b/daemon/libs/pjproject/pjlib/src/pj/compat/setjmp_i386.S
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/compat/setjmp_i386.S
rename to daemon/libs/pjproject/pjlib/src/pj/compat/setjmp_i386.S
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c b/daemon/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
rename to daemon/libs/pjproject/pjlib/src/pj/compat/sigjmp.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c b/daemon/libs/pjproject/pjlib/src/pj/compat/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/compat/string.c
rename to daemon/libs/pjproject/pjlib/src/pj/compat/string.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c b/daemon/libs/pjproject/pjlib/src/pj/compat/string_compat.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/compat/string_compat.c
rename to daemon/libs/pjproject/pjlib/src/pj/compat/string_compat.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/config.c b/daemon/libs/pjproject/pjlib/src/pj/config.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/config.c
rename to daemon/libs/pjproject/pjlib/src/pj/config.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c b/daemon/libs/pjproject/pjlib/src/pj/ctype.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ctype.c
rename to daemon/libs/pjproject/pjlib/src/pj/ctype.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/errno.c b/daemon/libs/pjproject/pjlib/src/pj/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/errno.c
rename to daemon/libs/pjproject/pjlib/src/pj/errno.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/except.c b/daemon/libs/pjproject/pjlib/src/pj/except.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/except.c
rename to daemon/libs/pjproject/pjlib/src/pj/except.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c b/daemon/libs/pjproject/pjlib/src/pj/extra-exports.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/extra-exports.c
rename to daemon/libs/pjproject/pjlib/src/pj/extra-exports.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c b/daemon/libs/pjproject/pjlib/src/pj/fifobuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/fifobuf.c
rename to daemon/libs/pjproject/pjlib/src/pj/fifobuf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c b/daemon/libs/pjproject/pjlib/src/pj/file_access_unistd.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/file_access_unistd.c
rename to daemon/libs/pjproject/pjlib/src/pj/file_access_unistd.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c b/daemon/libs/pjproject/pjlib/src/pj/file_access_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/file_access_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/file_access_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c b/daemon/libs/pjproject/pjlib/src/pj/file_io_ansi.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/file_io_ansi.c
rename to daemon/libs/pjproject/pjlib/src/pj/file_io_ansi.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c b/daemon/libs/pjproject/pjlib/src/pj/file_io_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/file_io_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/file_io_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid.c b/daemon/libs/pjproject/pjlib/src/pj/guid.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/guid.c
rename to daemon/libs/pjproject/pjlib/src/pj/guid.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c b/daemon/libs/pjproject/pjlib/src/pj/guid_simple.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/guid_simple.c
rename to daemon/libs/pjproject/pjlib/src/pj/guid_simple.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c b/daemon/libs/pjproject/pjlib/src/pj/guid_uuid.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/guid_uuid.c
rename to daemon/libs/pjproject/pjlib/src/pj/guid_uuid.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c b/daemon/libs/pjproject/pjlib/src/pj/guid_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/guid_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/guid_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/hash.c b/daemon/libs/pjproject/pjlib/src/pj/hash.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/hash.c
rename to daemon/libs/pjproject/pjlib/src/pj/hash.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_common_abs.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_dummy.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_epoll.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_select.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_select.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_select.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c b/daemon/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
rename to daemon/libs/pjproject/pjlib/src/pj/ioqueue_winnt.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c b/daemon/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
rename to daemon/libs/pjproject/pjlib/src/pj/ip_helper_generic.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c b/daemon/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/ip_helper_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/list.c b/daemon/libs/pjproject/pjlib/src/pj/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/list.c
rename to daemon/libs/pjproject/pjlib/src/pj/list.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/lock.c b/daemon/libs/pjproject/pjlib/src/pj/lock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/lock.c
rename to daemon/libs/pjproject/pjlib/src/pj/lock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log.c b/daemon/libs/pjproject/pjlib/src/pj/log.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/log.c
rename to daemon/libs/pjproject/pjlib/src/pj/log.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c b/daemon/libs/pjproject/pjlib/src/pj/log_writer_printk.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_printk.c
rename to daemon/libs/pjproject/pjlib/src/pj/log_writer_printk.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c b/daemon/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
rename to daemon/libs/pjproject/pjlib/src/pj/log_writer_stdout.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp b/daemon/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_core_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c b/daemon/libs/pjproject/pjlib/src/pj/os_core_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_core_unix.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_core_unix.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c b/daemon/libs/pjproject/pjlib/src/pj/os_core_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_core_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_core_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_error_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c b/daemon/libs/pjproject/pjlib/src/pj/os_error_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_error_unix.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_error_unix.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c b/daemon/libs/pjproject/pjlib/src/pj/os_error_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_error_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_error_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c b/daemon/libs/pjproject/pjlib/src/pj/os_rwmutex.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_rwmutex.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_rwmutex.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h b/daemon/libs/pjproject/pjlib/src/pj/os_symbian.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_symbian.h
rename to daemon/libs/pjproject/pjlib/src/pj/os_symbian.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c b/daemon/libs/pjproject/pjlib/src/pj/os_time_bsd.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_time_bsd.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_time_bsd.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c b/daemon/libs/pjproject/pjlib/src/pj/os_time_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_time_common.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_time_common.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_time_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c b/daemon/libs/pjproject/pjlib/src/pj/os_time_unix.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_time_unix.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_time_unix.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c b/daemon/libs/pjproject/pjlib/src/pj/os_time_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_time_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_time_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c b/daemon/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_timestamp_common.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_timestamp_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c b/daemon/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_timestamp_posix.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c b/daemon/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/os_timestamp_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool.c b/daemon/libs/pjproject/pjlib/src/pj/pool.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c b/daemon/libs/pjproject/pjlib/src/pj/pool_buf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_buf.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool_buf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c b/daemon/libs/pjproject/pjlib/src/pj/pool_caching.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_caching.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool_caching.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c b/daemon/libs/pjproject/pjlib/src/pj/pool_dbg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_dbg.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool_dbg.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c b/daemon/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool_policy_kmalloc.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c b/daemon/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
rename to daemon/libs/pjproject/pjlib/src/pj/pool_policy_malloc.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp b/daemon/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h b/daemon/libs/pjproject/pjlib/src/pj/pool_signature.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/pool_signature.h
rename to daemon/libs/pjproject/pjlib/src/pj/pool_signature.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/rand.c b/daemon/libs/pjproject/pjlib/src/pj/rand.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/rand.c
rename to daemon/libs/pjproject/pjlib/src/pj/rand.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c b/daemon/libs/pjproject/pjlib/src/pj/rbtree.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/rbtree.c
rename to daemon/libs/pjproject/pjlib/src/pj/rbtree.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c b/daemon/libs/pjproject/pjlib/src/pj/sock_bsd.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_bsd.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_bsd.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c b/daemon/libs/pjproject/pjlib/src/pj/sock_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_common.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_common.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c b/daemon/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c b/daemon/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_qos_bsd.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c b/daemon/libs/pjproject/pjlib/src/pj/sock_qos_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_common.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_qos_common.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c b/daemon/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_qos_dummy.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c b/daemon/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_qos_wm.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c b/daemon/libs/pjproject/pjlib/src/pj/sock_select.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_select.c
rename to daemon/libs/pjproject/pjlib/src/pj/sock_select.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c b/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
rename to daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c b/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
rename to daemon/libs/pjproject/pjlib/src/pj/ssl_sock_ossl.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/string.c b/daemon/libs/pjproject/pjlib/src/pj/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/string.c
rename to daemon/libs/pjproject/pjlib/src/pj/string.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c b/daemon/libs/pjproject/pjlib/src/pj/symbols.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/symbols.c
rename to daemon/libs/pjproject/pjlib/src/pj/symbols.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/timer.c b/daemon/libs/pjproject/pjlib/src/pj/timer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/timer.c
rename to daemon/libs/pjproject/pjlib/src/pj/timer.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/types.c b/daemon/libs/pjproject/pjlib/src/pj/types.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/types.c
rename to daemon/libs/pjproject/pjlib/src/pj/types.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c b/daemon/libs/pjproject/pjlib/src/pj/unicode_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pj/unicode_win32.c
rename to daemon/libs/pjproject/pjlib/src/pj/unicode_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp b/daemon/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
rename to daemon/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c b/daemon/libs/pjproject/pjlib/src/pjlib-samples/except.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/except.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-samples/except.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c b/daemon/libs/pjproject/pjlib/src/pjlib-samples/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/list.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-samples/list.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c b/daemon/libs/pjproject/pjlib/src/pjlib-samples/log.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-samples/log.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-samples/log.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/activesock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/activesock.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/activesock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/atomic.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/atomic.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/atomic.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/echo_clt.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/errno.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/errno.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/exception.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/exception.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp b/daemon/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/fifobuf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/file.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/file.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/file.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/hash_test.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_perf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_tcp.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_udp.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/ioq_unreg.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/list.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/list.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/list.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/main.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/main_mod.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/main_rtems.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_symbian.cpp b/daemon/libs/pjproject/pjlib/src/pjlib-test/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_symbian.cpp
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/mutex.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/mutex.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/mutex.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/os.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/os.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/os.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pjlib_test_reg.rss b/daemon/libs/pjproject/pjlib/src/pjlib-test/pjlib_test_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pjlib_test_reg.rss
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/pjlib_test_reg.rss
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/pool.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/pool.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/pool_perf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp b/daemon/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/rand.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rand.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/rand.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/rbtree.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h b/daemon/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/rtems_network_config.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/select.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/select.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/select.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/sleep.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sleep.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/sleep.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/sock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/sock_perf.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/ssl_sock.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/string.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/string.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/string.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/test.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h b/daemon/libs/pjproject/pjlib/src/pjlib-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test.h
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/test.h
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp b/daemon/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/thread.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/thread.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/thread.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/timer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timer.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/timer.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/timestamp.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/udp_echo_srv_sync.c
diff --git a/sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c b/daemon/libs/pjproject/pjlib/src/pjlib-test/util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjlib/src/pjlib-test/util.c
rename to daemon/libs/pjproject/pjlib/src/pjlib-test/util.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/README.txt b/daemon/libs/pjproject/pjmedia/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/README.txt
rename to daemon/libs/pjproject/pjmedia/README.txt
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/Jbtest.dat b/daemon/libs/pjproject/pjmedia/build/Jbtest.dat
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/Jbtest.dat
rename to daemon/libs/pjproject/pjmedia/build/Jbtest.dat
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/Makefile b/daemon/libs/pjproject/pjmedia/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/Makefile
rename to daemon/libs/pjproject/pjmedia/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/m-i386.mak b/daemon/libs/pjproject/pjmedia/build/m-i386.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/m-i386.mak
rename to daemon/libs/pjproject/pjmedia/build/m-i386.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/m-x86_64.mak b/daemon/libs/pjproject/pjmedia/build/m-x86_64.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/m-x86_64.mak
rename to daemon/libs/pjproject/pjmedia/build/m-x86_64.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/os-auto.mak.in b/daemon/libs/pjproject/pjmedia/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/os-auto.mak.in
rename to daemon/libs/pjproject/pjmedia/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/os-darwinos.mak b/daemon/libs/pjproject/pjmedia/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/os-darwinos.mak
rename to daemon/libs/pjproject/pjmedia/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/os-linux.mak b/daemon/libs/pjproject/pjmedia/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/os-linux.mak
rename to daemon/libs/pjproject/pjmedia/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/os-rtems.mak b/daemon/libs/pjproject/pjmedia/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/os-rtems.mak
rename to daemon/libs/pjproject/pjmedia/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/os-win32.mak b/daemon/libs/pjproject/pjmedia/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/os-win32.mak
rename to daemon/libs/pjproject/pjmedia/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjaut.dsp b/daemon/libs/pjproject/pjmedia/build/pjaut.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjaut.dsp
rename to daemon/libs/pjproject/pjmedia/build/pjaut.dsp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia.dsp b/daemon/libs/pjproject/pjmedia/build/pjmedia.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia.dsp
rename to daemon/libs/pjproject/pjmedia/build/pjmedia.dsp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia.dsw b/daemon/libs/pjproject/pjmedia/build/pjmedia.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia.dsw
rename to daemon/libs/pjproject/pjmedia/build/pjmedia.dsw
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia.vcproj b/daemon/libs/pjproject/pjmedia/build/pjmedia.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia.vcproj
rename to daemon/libs/pjproject/pjmedia/build/pjmedia.vcproj
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_audiodev.dsp b/daemon/libs/pjproject/pjmedia/build/pjmedia_audiodev.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_audiodev.dsp
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_audiodev.dsp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_audiodev.vcproj b/daemon/libs/pjproject/pjmedia/build/pjmedia_audiodev.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_audiodev.vcproj
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_audiodev.vcproj
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_codec.dsp b/daemon/libs/pjproject/pjmedia/build/pjmedia_codec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_codec.dsp
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_codec.dsp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_codec.vcproj b/daemon/libs/pjproject/pjmedia/build/pjmedia_codec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_codec.vcproj
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_codec.vcproj
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_test.dsp b/daemon/libs/pjproject/pjmedia/build/pjmedia_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_test.dsp
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/pjmedia_test.vcproj b/daemon/libs/pjproject/pjmedia/build/pjmedia_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/pjmedia_test.vcproj
rename to daemon/libs/pjproject/pjmedia/build/pjmedia_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_auddev_wince.vcp b/daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_auddev_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_auddev_wince.vcp
rename to daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_auddev_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp b/daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
rename to daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_test.vcp b/daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_test.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_test.vcp
rename to daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_test.vcp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcp b/daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcp
rename to daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcw b/daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcw
rename to daemon/libs/pjproject/pjmedia/build/wince-evc4/pjmedia_wince.vcw
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/doxygen.cfg b/daemon/libs/pjproject/pjmedia/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/doxygen.cfg
rename to daemon/libs/pjproject/pjmedia/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/footer.html b/daemon/libs/pjproject/pjmedia/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/footer.html
rename to daemon/libs/pjproject/pjmedia/docs/footer.html
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/header.html b/daemon/libs/pjproject/pjmedia/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/header.html
rename to daemon/libs/pjproject/pjmedia/docs/header.html
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/master-port.jpg b/daemon/libs/pjproject/pjmedia/docs/master-port.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/master-port.jpg
rename to daemon/libs/pjproject/pjmedia/docs/master-port.jpg
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/media-flow.jpg b/daemon/libs/pjproject/pjmedia/docs/media-flow.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/media-flow.jpg
rename to daemon/libs/pjproject/pjmedia/docs/media-flow.jpg
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/media-flow.vsd b/daemon/libs/pjproject/pjmedia/docs/media-flow.vsd
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/media-flow.vsd
rename to daemon/libs/pjproject/pjmedia/docs/media-flow.vsd
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/media-srtp-transport.PNG b/daemon/libs/pjproject/pjmedia/docs/media-srtp-transport.PNG
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/media-srtp-transport.PNG
rename to daemon/libs/pjproject/pjmedia/docs/media-srtp-transport.PNG
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/media-transport.PNG b/daemon/libs/pjproject/pjmedia/docs/media-transport.PNG
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/media-transport.PNG
rename to daemon/libs/pjproject/pjmedia/docs/media-transport.PNG
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/sample-manual-resampling.jpg b/daemon/libs/pjproject/pjmedia/docs/sample-manual-resampling.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/sample-manual-resampling.jpg
rename to daemon/libs/pjproject/pjmedia/docs/sample-manual-resampling.jpg
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/siprtp.jpg b/daemon/libs/pjproject/pjmedia/docs/siprtp.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/siprtp.jpg
rename to daemon/libs/pjproject/pjmedia/docs/siprtp.jpg
diff --git a/sflphone-common/libs/pjproject/pjmedia/docs/sndtest.jpg b/daemon/libs/pjproject/pjmedia/docs/sndtest.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/docs/sndtest.jpg
rename to daemon/libs/pjproject/pjmedia/docs/sndtest.jpg
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiodev_imp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/audiotest.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-audiodev/errno.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/amr_helper.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/g722.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/g7221.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/gsm.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/ilbc.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/ipp_codecs.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/l16.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/passthrough.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/speex.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h b/daemon/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia-codec/types.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h b/daemon/libs/pjproject/pjmedia/include/pjmedia.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/alaw_ulaw.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/bidirectional.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/circbuf.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/clock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/clock.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/clock.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/codec.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/codec.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/codec.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/conference.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/conference.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/conference.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/config.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in b/daemon/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/config_auto.h.in
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/delaybuf.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/doxygen.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/echo.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/echo.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/echo_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/endpoint.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/errno.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/errno.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/g711.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/g711.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/g711.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/jbuf.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/master_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/master_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/master_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/mem_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/null_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/null_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/null_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/plc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/plc.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/plc.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/resample.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/resample.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/resample.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/rtcp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/rtcp_xr.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/rtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/rtp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/rtp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/sdp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/sdp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/sdp_neg.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/session.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/session.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/session.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/silencedet.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/sound.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/sound.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/sound_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/splitcomb.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/stereo.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stereo.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/stereo.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/stream.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/stream.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/symbian_sound_aps.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/tonegen.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport_adapter_sample.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport_ice.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport_loop.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport_srtp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/transport_udp.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/types.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/types.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/wav_playlist.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/wav_port.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/wave.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wave.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/wave.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h b/daemon/libs/pjproject/pjmedia/include/pjmedia/wsola.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia/wsola.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia/wsola.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h b/daemon/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
rename to daemon/libs/pjproject/pjmedia/include/pjmedia_audiodev.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/audiotest.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/errno.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/pa_dev.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-audiodev/wmme_dev.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_dec.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g722/g722_enc.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/g7221.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/gsm.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/ilbc.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/l16.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/passthrough.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c b/daemon/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia-codec/speex_codec.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/alaw_ulaw_table.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/bidirectional.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/clock_thread.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/codec.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/codec.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/codec.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/conf_switch.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/conference.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/conference.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/conference.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/delaybuf.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/echo_common.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h b/daemon/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/echo_internal.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/echo_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/echo_speex.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/echo_suppress.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/endpoint.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/errno.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/errno.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/g711.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/g711.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/g711.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/jbuf.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/master_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/master_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/master_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/mem_capture.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/mem_player.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/null_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/null_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/null_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/plc_common.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/resample_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/resample_resample.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/resample_speex.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/rtcp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/rtcp_xr.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/rtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/rtp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/rtp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/sdp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sdp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_cmp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_neg.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp b/daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/session.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/session.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/session.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/silencedet.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sound_legacy.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/sound_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/splitcomb.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/stereo_port.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/stream.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/stream.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/stream.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/tonegen.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/transport_adapter_sample.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/transport_ice.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/transport_loop.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/transport_srtp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/transport_udp.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/wav_player.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/wav_playlist.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/wav_writer.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/wave.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wave.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/wave.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c b/daemon/libs/pjproject/pjmedia/src/pjmedia/wsola.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/pjmedia/wsola.c
rename to daemon/libs/pjproject/pjmedia/src/pjmedia/wsola.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c b/daemon/libs/pjproject/pjmedia/src/test/audio_tool.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/audio_tool.c
rename to daemon/libs/pjproject/pjmedia/src/test/audio_tool.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c b/daemon/libs/pjproject/pjmedia/src/test/codec_vectors.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/codec_vectors.c
rename to daemon/libs/pjproject/pjmedia/src/test/codec_vectors.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c b/daemon/libs/pjproject/pjmedia/src/test/jbuf_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/jbuf_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/jbuf_test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/main.c b/daemon/libs/pjproject/pjmedia/src/test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/main.c
rename to daemon/libs/pjproject/pjmedia/src/test/main.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c b/daemon/libs/pjproject/pjmedia/src/test/mips_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/mips_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/mips_test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c b/daemon/libs/pjproject/pjmedia/src/test/rtp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/rtp_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/rtp_test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c b/daemon/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/sdp_neg_test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c b/daemon/libs/pjproject/pjmedia/src/test/sdptest.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/sdptest.c
rename to daemon/libs/pjproject/pjmedia/src/test/sdptest.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c b/daemon/libs/pjproject/pjmedia/src/test/session_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/session_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/session_test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/test.c b/daemon/libs/pjproject/pjmedia/src/test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/test.c
rename to daemon/libs/pjproject/pjmedia/src/test/test.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/test.h b/daemon/libs/pjproject/pjmedia/src/test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/test.h
rename to daemon/libs/pjproject/pjmedia/src/test/test.h
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c b/daemon/libs/pjproject/pjmedia/src/test/wince_main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/wince_main.c
rename to daemon/libs/pjproject/pjmedia/src/test/wince_main.c
diff --git a/sflphone-common/libs/pjproject/pjmedia/src/test/wsola_test.c b/daemon/libs/pjproject/pjmedia/src/test/wsola_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjmedia/src/test/wsola_test.c
rename to daemon/libs/pjproject/pjmedia/src/test/wsola_test.c
diff --git a/sflphone-common/libs/pjproject/pjnath/build/Makefile b/daemon/libs/pjproject/pjnath/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/Makefile
rename to daemon/libs/pjproject/pjnath/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjnath.dsp b/daemon/libs/pjproject/pjnath/build/pjnath.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjnath.dsp
rename to daemon/libs/pjproject/pjnath/build/pjnath.dsp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjnath.dsw b/daemon/libs/pjproject/pjnath/build/pjnath.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjnath.dsw
rename to daemon/libs/pjproject/pjnath/build/pjnath.dsw
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjnath.vcproj b/daemon/libs/pjproject/pjnath/build/pjnath.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjnath.vcproj
rename to daemon/libs/pjproject/pjnath/build/pjnath.vcproj
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjnath_test.dsp b/daemon/libs/pjproject/pjnath/build/pjnath_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjnath_test.dsp
rename to daemon/libs/pjproject/pjnath/build/pjnath_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjnath_test.vcproj b/daemon/libs/pjproject/pjnath/build/pjnath_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjnath_test.vcproj
rename to daemon/libs/pjproject/pjnath/build/pjnath_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjstun_srv_test.dsp b/daemon/libs/pjproject/pjnath/build/pjstun_srv_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjstun_srv_test.dsp
rename to daemon/libs/pjproject/pjnath/build/pjstun_srv_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjstun_srv_test.vcproj b/daemon/libs/pjproject/pjnath/build/pjstun_srv_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjstun_srv_test.vcproj
rename to daemon/libs/pjproject/pjnath/build/pjstun_srv_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjturn_client.dsp b/daemon/libs/pjproject/pjnath/build/pjturn_client.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjturn_client.dsp
rename to daemon/libs/pjproject/pjnath/build/pjturn_client.dsp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjturn_client.vcproj b/daemon/libs/pjproject/pjnath/build/pjturn_client.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjturn_client.vcproj
rename to daemon/libs/pjproject/pjnath/build/pjturn_client.vcproj
diff --git a/sflphone-common/libs/pjproject/pjnath/build/pjturn_srv.dsp b/daemon/libs/pjproject/pjnath/build/pjturn_srv.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/pjturn_srv.dsp
rename to daemon/libs/pjproject/pjnath/build/pjturn_srv.dsp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_test_wince.vcp b/daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_test_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_test_wince.vcp
rename to daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_test_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcp b/daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcp
rename to daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcw b/daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcw
rename to daemon/libs/pjproject/pjnath/build/wince-evc4/pjnath_wince.vcw
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/UML-class-diagram.dia b/daemon/libs/pjproject/pjnath/docs/UML-class-diagram.dia
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/UML-class-diagram.dia
rename to daemon/libs/pjproject/pjnath/docs/UML-class-diagram.dia
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/UML-class-diagram.png b/daemon/libs/pjproject/pjnath/docs/UML-class-diagram.png
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/UML-class-diagram.png
rename to daemon/libs/pjproject/pjnath/docs/UML-class-diagram.png
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_ice.h b/daemon/libs/pjproject/pjnath/docs/doc_ice.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_ice.h
rename to daemon/libs/pjproject/pjnath/docs/doc_ice.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_mainpage.h b/daemon/libs/pjproject/pjnath/docs/doc_mainpage.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_mainpage.h
rename to daemon/libs/pjproject/pjnath/docs/doc_mainpage.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_nat.h b/daemon/libs/pjproject/pjnath/docs/doc_nat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_nat.h
rename to daemon/libs/pjproject/pjnath/docs/doc_nat.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_samples.h b/daemon/libs/pjproject/pjnath/docs/doc_samples.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_samples.h
rename to daemon/libs/pjproject/pjnath/docs/doc_samples.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_stun.h b/daemon/libs/pjproject/pjnath/docs/doc_stun.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_stun.h
rename to daemon/libs/pjproject/pjnath/docs/doc_stun.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doc_turn.h b/daemon/libs/pjproject/pjnath/docs/doc_turn.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doc_turn.h
rename to daemon/libs/pjproject/pjnath/docs/doc_turn.h
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doxygen.cfg b/daemon/libs/pjproject/pjnath/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doxygen.cfg
rename to daemon/libs/pjproject/pjnath/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/doxygen.css b/daemon/libs/pjproject/pjnath/docs/doxygen.css
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/doxygen.css
rename to daemon/libs/pjproject/pjnath/docs/doxygen.css
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/footer.html b/daemon/libs/pjproject/pjnath/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/footer.html
rename to daemon/libs/pjproject/pjnath/docs/footer.html
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/header.html b/daemon/libs/pjproject/pjnath/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/header.html
rename to daemon/libs/pjproject/pjnath/docs/header.html
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/ice-arch.jpg b/daemon/libs/pjproject/pjnath/docs/ice-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/ice-arch.jpg
rename to daemon/libs/pjproject/pjnath/docs/ice-arch.jpg
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/ice_demo.jpg b/daemon/libs/pjproject/pjnath/docs/ice_demo.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/ice_demo.jpg
rename to daemon/libs/pjproject/pjnath/docs/ice_demo.jpg
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/pjturn_client.jpg b/daemon/libs/pjproject/pjnath/docs/pjturn_client.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/pjturn_client.jpg
rename to daemon/libs/pjproject/pjnath/docs/pjturn_client.jpg
diff --git a/sflphone-common/libs/pjproject/pjnath/docs/stun-arch.jpg b/daemon/libs/pjproject/pjnath/docs/stun-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/docs/stun-arch.jpg
rename to daemon/libs/pjproject/pjnath/docs/stun-arch.jpg
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath.h b/daemon/libs/pjproject/pjnath/include/pjnath.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath.h
rename to daemon/libs/pjproject/pjnath/include/pjnath.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h b/daemon/libs/pjproject/pjnath/include/pjnath/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/config.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h b/daemon/libs/pjproject/pjnath/include/pjnath/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/errno.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/errno.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h b/daemon/libs/pjproject/pjnath/include/pjnath/ice_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_session.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/ice_session.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h b/daemon/libs/pjproject/pjnath/include/pjnath/ice_strans.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/ice_strans.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/ice_strans.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h b/daemon/libs/pjproject/pjnath/include/pjnath/nat_detect.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/nat_detect.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/nat_detect.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_auth.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_auth.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_config.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_config.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_msg.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_msg.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_session.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_session.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_sock.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_sock.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h b/daemon/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/stun_transaction.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h b/daemon/libs/pjproject/pjnath/include/pjnath/turn_session.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_session.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/turn_session.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h b/daemon/libs/pjproject/pjnath/include/pjnath/turn_sock.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/turn_sock.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/turn_sock.h
diff --git a/sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h b/daemon/libs/pjproject/pjnath/include/pjnath/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/include/pjnath/types.h
rename to daemon/libs/pjproject/pjnath/include/pjnath/types.h
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/ice_test.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/main.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main_win32.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/main_win32.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/main_win32.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/server.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/server.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h b/daemon/libs/pjproject/pjnath/src/pjnath-test/server.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/server.h
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/server.h
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/sess_auth.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/stun.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/stun.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/stun_sock_test.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/test.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h b/daemon/libs/pjproject/pjnath/src/pjnath-test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/test.h
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/test.h
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c b/daemon/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
rename to daemon/libs/pjproject/pjnath/src/pjnath-test/turn_sock_test.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c b/daemon/libs/pjproject/pjnath/src/pjnath/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/errno.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/errno.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c b/daemon/libs/pjproject/pjnath/src/pjnath/ice_session.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_session.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/ice_session.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c b/daemon/libs/pjproject/pjnath/src/pjnath/ice_strans.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/ice_strans.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/ice_strans.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c b/daemon/libs/pjproject/pjnath/src/pjnath/nat_detect.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/nat_detect.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/nat_detect.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_auth.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_auth.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_msg.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_msg_dump.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_session.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_session.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_session.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_sock.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_sock.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c b/daemon/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/stun_transaction.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c b/daemon/libs/pjproject/pjnath/src/pjnath/turn_session.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_session.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/turn_session.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c b/daemon/libs/pjproject/pjnath/src/pjnath/turn_sock.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjnath/turn_sock.c
rename to daemon/libs/pjproject/pjnath/src/pjnath/turn_sock.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c b/daemon/libs/pjproject/pjnath/src/pjturn-client/client_main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-client/client_main.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-client/client_main.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/allocation.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/auth.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h b/daemon/libs/pjproject/pjnath/src/pjturn-srv/auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/auth.h
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/auth.h
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/listener_tcp.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/listener_udp.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/main.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/main.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c b/daemon/libs/pjproject/pjnath/src/pjturn-srv/server.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/server.c
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/server.c
diff --git a/sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h b/daemon/libs/pjproject/pjnath/src/pjturn-srv/turn.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjnath/src/pjturn-srv/turn.h
rename to daemon/libs/pjproject/pjnath/src/pjturn-srv/turn.h
diff --git a/sflphone-common/libs/pjproject/pjproject-vs8.sln b/daemon/libs/pjproject/pjproject-vs8.sln
similarity index 100%
rename from sflphone-common/libs/pjproject/pjproject-vs8.sln
rename to daemon/libs/pjproject/pjproject-vs8.sln
diff --git a/sflphone-common/libs/pjproject/pjproject.dsw b/daemon/libs/pjproject/pjproject.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjproject.dsw
rename to daemon/libs/pjproject/pjproject.dsw
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/Footprint.mak b/daemon/libs/pjproject/pjsip-apps/build/Footprint.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/Footprint.mak
rename to daemon/libs/pjproject/pjsip-apps/build/Footprint.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/Makefile b/daemon/libs/pjproject/pjsip-apps/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/Makefile
rename to daemon/libs/pjproject/pjsip-apps/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/Samples-vc.mak b/daemon/libs/pjproject/pjsip-apps/build/Samples-vc.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/Samples-vc.mak
rename to daemon/libs/pjproject/pjsip-apps/build/Samples-vc.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/Samples.mak b/daemon/libs/pjproject/pjsip-apps/build/Samples.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/Samples.mak
rename to daemon/libs/pjproject/pjsip-apps/build/Samples.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/dummy.c b/daemon/libs/pjproject/pjsip-apps/build/dummy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/dummy.c
rename to daemon/libs/pjproject/pjsip-apps/build/dummy.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/get-footprint.py b/daemon/libs/pjproject/pjsip-apps/build/get-footprint.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/get-footprint.py
rename to daemon/libs/pjproject/pjsip-apps/build/get-footprint.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/libpjproject.vcproj b/daemon/libs/pjproject/pjsip-apps/build/libpjproject.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/libpjproject.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/libpjproject.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/os-win32.mak b/daemon/libs/pjproject/pjsip-apps/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/os-win32.mak
rename to daemon/libs/pjproject/pjsip-apps/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/pjsip_apps.dsw b/daemon/libs/pjproject/pjsip-apps/build/pjsip_apps.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/pjsip_apps.dsw
rename to daemon/libs/pjproject/pjsip-apps/build/pjsip_apps.dsw
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/pjsua.dsp b/daemon/libs/pjproject/pjsip-apps/build/pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/pjsua.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/pjsua.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/pjsua.vcproj b/daemon/libs/pjproject/pjsip-apps/build/pjsua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/pjsua.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/pjsua.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/pjsystest.dsp b/daemon/libs/pjproject/pjsip-apps/build/pjsystest.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/pjsystest.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/pjsystest.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/pjsystest.vcproj b/daemon/libs/pjproject/pjsip-apps/build/pjsystest.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/pjsystest.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/pjsystest.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/py_pjsua.dsp b/daemon/libs/pjproject/pjsip-apps/build/py_pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/py_pjsua.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/py_pjsua.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/py_pjsua.vcproj b/daemon/libs/pjproject/pjsip-apps/build/py_pjsua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/py_pjsua.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/py_pjsua.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/python_pjsua.dsp b/daemon/libs/pjproject/pjsip-apps/build/python_pjsua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/python_pjsua.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/python_pjsua.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/python_pjsua.vcproj b/daemon/libs/pjproject/pjsip-apps/build/python_pjsua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/python_pjsua.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/python_pjsua.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/sample_debug.dsp b/daemon/libs/pjproject/pjsip-apps/build/sample_debug.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/sample_debug.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/sample_debug.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/sample_debug.vcproj b/daemon/libs/pjproject/pjsip-apps/build/sample_debug.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/sample_debug.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/sample_debug.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/samples.dsp b/daemon/libs/pjproject/pjsip-apps/build/samples.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/samples.dsp
rename to daemon/libs/pjproject/pjsip-apps/build/samples.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/samples.vcproj b/daemon/libs/pjproject/pjsip-apps/build/samples.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/samples.vcproj
rename to daemon/libs/pjproject/pjsip-apps/build/samples.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/build/wince-evc4/wince_demos.vcw b/daemon/libs/pjproject/pjsip-apps/build/wince-evc4/wince_demos.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/build/wince-evc4/wince_demos.vcw
rename to daemon/libs/pjproject/pjsip-apps/build/wince-evc4/wince_demos.vcw
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/confbot/confbot.py b/daemon/libs/pjproject/pjsip-apps/src/confbot/confbot.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/confbot/confbot.py
rename to daemon/libs/pjproject/pjsip-apps/src/confbot/confbot.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/confbot/config.py b/daemon/libs/pjproject/pjsip-apps/src/confbot/config.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/confbot/config.py
rename to daemon/libs/pjproject/pjsip-apps/src/confbot/config.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/main.c b/daemon/libs/pjproject/pjsip-apps/src/pjsua/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/main.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua/main.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/main_rtems.c b/daemon/libs/pjproject/pjsip-apps/src/pjsua/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/main_rtems.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua/main_rtems.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/pjsua_app.c b/daemon/libs/pjproject/pjsip-apps/src/pjsua/pjsua_app.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua/pjsua_app.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua/pjsua_app.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/README.TXT b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/README.TXT
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/README.TXT
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.cpp b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.h b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/StdAfx.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/newres.h b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/newres.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/newres.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/newres.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.h b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.ico b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.ico
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.rc b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.rc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcproj b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcproj
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/pjsua_wince.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/resource.h b/daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/resource.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsua_wince/resource.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsua_wince/resource.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/gui.h b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/gui.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/gui.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/gui.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/main_console.c b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/main_console.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/main_console.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/main_console.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/main_wm.c b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/main_wm.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/main_wm.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/main_wm.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc2 b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc2
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc2
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc2
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/resource.h b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/resource.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/resource.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/resource.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/systest.c b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/systest.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/systest.c
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/systest.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/systest.h b/daemon/libs/pjproject/pjsip-apps/src/pjsystest/systest.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pjsystest/systest.h
rename to daemon/libs/pjproject/pjsip-apps/src/pjsystest/systest.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.cpp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.rc b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.rc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.rc
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.rc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcc b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcc
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcproj b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcproj
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcw b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcw
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJ.vcw
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.cpp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PocketPJDlg.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.cpp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/PopUpWnd.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/ReadMe.txt b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/ReadMe.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/ReadMe.txt
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/ReadMe.txt
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.cpp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/SettingsDlg.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.cpp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/StdAfx.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/newres.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/newres.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/newres.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/newres.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.ico b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.ico
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.ico
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.ico
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/PocketPJ.rc2
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/action.bmp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/action.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/action.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/action.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/blank.bmp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/blank.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/blank.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/blank.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.bmp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.ico b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.ico
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.ico
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/invisibl.ico
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.bmp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.ico b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.ico
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.ico
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/offline.ico
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/online.bmp b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/online.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/online.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/online.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/online.ico b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/online.ico
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/res/online.ico
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/res/online.ico
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/resource.h b/daemon/libs/pjproject/pjsip-apps/src/pocketpj/resource.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/pocketpj/resource.h
rename to daemon/libs/pjproject/pjsip-apps/src/pocketpj/resource.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/DEPRECATED.txt b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/DEPRECATED.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/DEPRECATED.txt
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/DEPRECATED.txt
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/Makefile b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/Makefile
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/Makefile
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/helper.mak b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/helper.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/helper.mak
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/helper.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua.py b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua.py
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua_app.py b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua_app.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua_app.py
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/pjsua_app.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.c b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.c
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.def b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.def
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.def
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.def
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.h b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.h
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/py_pjsua.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/setup.py b/daemon/libs/pjproject/pjsip-apps/src/py_pjsua/setup.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/py_pjsua/setup.py
rename to daemon/libs/pjproject/pjsip-apps/src/py_pjsua/setup.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/Makefile b/daemon/libs/pjproject/pjsip-apps/src/python/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/Makefile
rename to daemon/libs/pjproject/pjsip-apps/src/python/Makefile
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.c b/daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.c
rename to daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.def b/daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.def
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.def
rename to daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.def
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.h b/daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/_pjsua.h
rename to daemon/libs/pjproject/pjsip-apps/src/python/_pjsua.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/helper.mak b/daemon/libs/pjproject/pjsip-apps/src/python/helper.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/helper.mak
rename to daemon/libs/pjproject/pjsip-apps/src/python/helper.mak
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/pjsua.py b/daemon/libs/pjproject/pjsip-apps/src/python/pjsua.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/pjsua.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/pjsua.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/call.py b/daemon/libs/pjproject/pjsip-apps/src/python/samples/call.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/call.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/samples/call.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/presence.py b/daemon/libs/pjproject/pjsip-apps/src/python/samples/presence.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/presence.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/samples/presence.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/registration.py b/daemon/libs/pjproject/pjsip-apps/src/python/samples/registration.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/registration.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/samples/registration.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/simplecall.py b/daemon/libs/pjproject/pjsip-apps/src/python/samples/simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/samples/simplecall.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/samples/simplecall.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/setup-vc.py b/daemon/libs/pjproject/pjsip-apps/src/python/setup-vc.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/setup-vc.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/setup-vc.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/python/setup.py b/daemon/libs/pjproject/pjsip-apps/src/python/setup.py
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/python/setup.py
rename to daemon/libs/pjproject/pjsip-apps/src/python/setup.py
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/aectest.c b/daemon/libs/pjproject/pjsip-apps/src/samples/aectest.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/aectest.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/aectest.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/auddemo.c b/daemon/libs/pjproject/pjsip-apps/src/samples/auddemo.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/auddemo.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/auddemo.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/confbench.c b/daemon/libs/pjproject/pjsip-apps/src/samples/confbench.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/confbench.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/confbench.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/confsample.c b/daemon/libs/pjproject/pjsip-apps/src/samples/confsample.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/confsample.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/confsample.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/debug.c b/daemon/libs/pjproject/pjsip-apps/src/samples/debug.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/debug.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/debug.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/encdec.c b/daemon/libs/pjproject/pjsip-apps/src/samples/encdec.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/encdec.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/encdec.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/footprint.c b/daemon/libs/pjproject/pjsip-apps/src/samples/footprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/footprint.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/footprint.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/icedemo.c b/daemon/libs/pjproject/pjsip-apps/src/samples/icedemo.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/icedemo.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/icedemo.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/invtester.c b/daemon/libs/pjproject/pjsip-apps/src/samples/invtester.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/invtester.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/invtester.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/jbsim.c b/daemon/libs/pjproject/pjsip-apps/src/samples/jbsim.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/jbsim.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/jbsim.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/latency.c b/daemon/libs/pjproject/pjsip-apps/src/samples/latency.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/latency.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/latency.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/level.c b/daemon/libs/pjproject/pjsip-apps/src/samples/level.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/level.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/level.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/main_rtems.c b/daemon/libs/pjproject/pjsip-apps/src/samples/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/main_rtems.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/main_rtems.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/mix.c b/daemon/libs/pjproject/pjsip-apps/src/samples/mix.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/mix.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/mix.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/pcaputil.c b/daemon/libs/pjproject/pjsip-apps/src/samples/pcaputil.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/pcaputil.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/pcaputil.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/pjsip-perf.c b/daemon/libs/pjproject/pjsip-apps/src/samples/pjsip-perf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/pjsip-perf.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/pjsip-perf.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/playfile.c b/daemon/libs/pjproject/pjsip-apps/src/samples/playfile.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/playfile.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/playfile.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/playsine.c b/daemon/libs/pjproject/pjsip-apps/src/samples/playsine.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/playsine.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/playsine.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/proxy.h b/daemon/libs/pjproject/pjsip-apps/src/samples/proxy.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/proxy.h
rename to daemon/libs/pjproject/pjsip-apps/src/samples/proxy.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/recfile.c b/daemon/libs/pjproject/pjsip-apps/src/samples/recfile.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/recfile.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/recfile.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/resampleplay.c b/daemon/libs/pjproject/pjsip-apps/src/samples/resampleplay.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/resampleplay.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/resampleplay.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/simple_pjsua.c b/daemon/libs/pjproject/pjsip-apps/src/samples/simple_pjsua.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/simple_pjsua.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/simple_pjsua.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/simpleua.c b/daemon/libs/pjproject/pjsip-apps/src/samples/simpleua.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/simpleua.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/simpleua.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/siprtp.c b/daemon/libs/pjproject/pjsip-apps/src/samples/siprtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/siprtp.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/siprtp.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/siprtp_report.c b/daemon/libs/pjproject/pjsip-apps/src/samples/siprtp_report.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/siprtp_report.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/siprtp_report.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/sipstateless.c b/daemon/libs/pjproject/pjsip-apps/src/samples/sipstateless.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/sipstateless.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/sipstateless.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/stateful_proxy.c b/daemon/libs/pjproject/pjsip-apps/src/samples/stateful_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/stateful_proxy.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/stateful_proxy.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/stateless_proxy.c b/daemon/libs/pjproject/pjsip-apps/src/samples/stateless_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/stateless_proxy.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/stateless_proxy.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/stereotest.c b/daemon/libs/pjproject/pjsip-apps/src/samples/stereotest.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/stereotest.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/stereotest.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/streamutil.c b/daemon/libs/pjproject/pjsip-apps/src/samples/streamutil.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/streamutil.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/streamutil.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/strerror.c b/daemon/libs/pjproject/pjsip-apps/src/samples/strerror.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/strerror.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/strerror.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/tonegen.c b/daemon/libs/pjproject/pjsip-apps/src/samples/tonegen.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/tonegen.c
rename to daemon/libs/pjproject/pjsip-apps/src/samples/tonegen.c
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/samples/util.h b/daemon/libs/pjproject/pjsip-apps/src/samples/util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/samples/util.h
rename to daemon/libs/pjproject/pjsip-apps/src/samples/util.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/main_symbian.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/main_symbian.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/ua.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua/ua.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/ua.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua/ua.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/ua.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua/ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua/ua.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua/ua.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/application.uidesign b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/application.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/application.uidesign
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/application.uidesign
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/bld.inf b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/bld.inf
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/bld.inf
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/bld.inf
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign b/daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
rename to daemon/libs/pjproject/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/app_main.cpp b/daemon/libs/pjproject/pjsip-apps/src/symsndtest/app_main.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/app_main.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symsndtest/app_main.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/main_symbian.cpp b/daemon/libs/pjproject/pjsip-apps/src/symsndtest/main_symbian.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/main_symbian.cpp
rename to daemon/libs/pjproject/pjsip-apps/src/symsndtest/main_symbian.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/daemon/libs/pjproject/pjsip-apps/src/symsndtest/symsndtest_reg.rss
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip-apps/src/symsndtest/symsndtest_reg.rss
rename to daemon/libs/pjproject/pjsip-apps/src/symsndtest/symsndtest_reg.rss
diff --git a/sflphone-common/libs/pjproject/pjsip/build/Makefile b/daemon/libs/pjproject/pjsip/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/Makefile
rename to daemon/libs/pjproject/pjsip/build/Makefile
diff --git a/sflphone-common/libs/pjproject/pjsip/build/os-auto.mak.in b/daemon/libs/pjproject/pjsip/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/os-auto.mak.in
rename to daemon/libs/pjproject/pjsip/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/pjsip/build/os-rtems.mak b/daemon/libs/pjproject/pjsip/build/os-rtems.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/os-rtems.mak
rename to daemon/libs/pjproject/pjsip/build/os-rtems.mak
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip.dsw b/daemon/libs/pjproject/pjsip/build/pjsip.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip.dsw
rename to daemon/libs/pjproject/pjsip/build/pjsip.dsw
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_core.dsp b/daemon/libs/pjproject/pjsip/build/pjsip_core.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_core.dsp
rename to daemon/libs/pjproject/pjsip/build/pjsip_core.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_core.vcproj b/daemon/libs/pjproject/pjsip/build/pjsip_core.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_core.vcproj
rename to daemon/libs/pjproject/pjsip/build/pjsip_core.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_simple.dsp b/daemon/libs/pjproject/pjsip/build/pjsip_simple.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_simple.dsp
rename to daemon/libs/pjproject/pjsip/build/pjsip_simple.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_simple.vcproj b/daemon/libs/pjproject/pjsip/build/pjsip_simple.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_simple.vcproj
rename to daemon/libs/pjproject/pjsip/build/pjsip_simple.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_test.dsp b/daemon/libs/pjproject/pjsip/build/pjsip_test.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_test.dsp
rename to daemon/libs/pjproject/pjsip/build/pjsip_test.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_test.vcproj b/daemon/libs/pjproject/pjsip/build/pjsip_test.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_test.vcproj
rename to daemon/libs/pjproject/pjsip/build/pjsip_test.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_ua.dsp b/daemon/libs/pjproject/pjsip/build/pjsip_ua.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_ua.dsp
rename to daemon/libs/pjproject/pjsip/build/pjsip_ua.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsip_ua.vcproj b/daemon/libs/pjproject/pjsip/build/pjsip_ua.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsip_ua.vcproj
rename to daemon/libs/pjproject/pjsip/build/pjsip_ua.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsua_lib.dsp b/daemon/libs/pjproject/pjsip/build/pjsua_lib.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsua_lib.dsp
rename to daemon/libs/pjproject/pjsip/build/pjsua_lib.dsp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/pjsua_lib.vcproj b/daemon/libs/pjproject/pjsip/build/pjsua_lib.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/pjsua_lib.vcproj
rename to daemon/libs/pjproject/pjsip/build/pjsua_lib.vcproj
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_core_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_core_wince.vcp
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_core_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_simple_wince.vcp b/daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_simple_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_ua_wince.vcp b/daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_ua_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_wince.vcw b/daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_wince.vcw
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsip_wince.vcw
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/pjsip_wince.vcw
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsua_lib_wince.vcp b/daemon/libs/pjproject/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/pjsua_lib_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip/build/wince-evc4/test_pjsip_wince.vcp b/daemon/libs/pjproject/pjsip/build/wince-evc4/test_pjsip_wince.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/build/wince-evc4/test_pjsip_wince.vcp
rename to daemon/libs/pjproject/pjsip/build/wince-evc4/test_pjsip_wince.vcp
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/PJSUA-TESTING.txt b/daemon/libs/pjproject/pjsip/docs/PJSUA-TESTING.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/PJSUA-TESTING.txt
rename to daemon/libs/pjproject/pjsip/docs/PJSUA-TESTING.txt
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/TRANSPORT-PROBLEMS.TXT b/daemon/libs/pjproject/pjsip/docs/TRANSPORT-PROBLEMS.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/TRANSPORT-PROBLEMS.TXT
rename to daemon/libs/pjproject/pjsip/docs/TRANSPORT-PROBLEMS.TXT
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/doxygen.cfg b/daemon/libs/pjproject/pjsip/docs/doxygen.cfg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/doxygen.cfg
rename to daemon/libs/pjproject/pjsip/docs/doxygen.cfg
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/doxygen.h b/daemon/libs/pjproject/pjsip/docs/doxygen.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/doxygen.h
rename to daemon/libs/pjproject/pjsip/docs/doxygen.h
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/footer.html b/daemon/libs/pjproject/pjsip/docs/footer.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/footer.html
rename to daemon/libs/pjproject/pjsip/docs/footer.html
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/header.html b/daemon/libs/pjproject/pjsip/docs/header.html
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/header.html
rename to daemon/libs/pjproject/pjsip/docs/header.html
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/pjsip-arch.jpg b/daemon/libs/pjproject/pjsip/docs/pjsip-arch.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/pjsip-arch.jpg
rename to daemon/libs/pjproject/pjsip/docs/pjsip-arch.jpg
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/pjsip-perf.jpg b/daemon/libs/pjproject/pjsip/docs/pjsip-perf.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/pjsip-perf.jpg
rename to daemon/libs/pjproject/pjsip/docs/pjsip-perf.jpg
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/pjsua.jpg b/daemon/libs/pjproject/pjsip/docs/pjsua.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/pjsua.jpg
rename to daemon/libs/pjproject/pjsip/docs/pjsua.jpg
diff --git a/sflphone-common/libs/pjproject/pjsip/docs/siprtp.jpg b/daemon/libs/pjproject/pjsip/docs/siprtp.jpg
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/docs/siprtp.jpg
rename to daemon/libs/pjproject/pjsip/docs/siprtp.jpg
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/errno.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/errno.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/evsub.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/evsub_msg.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/iscomposing.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/mwi.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/pidf.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/presence.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/presence.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/presence.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/publish.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/publish.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/publish.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/rpid.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/types.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/types.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h b/daemon/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-simple/xpidf.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_100rel.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_inv.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_regc.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_replaces.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_timer.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h b/daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
rename to daemon/libs/pjproject/pjsip/include/pjsip-ua/sip_xfer.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip.h b/daemon/libs/pjproject/pjsip/include/pjsip.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip.h
rename to daemon/libs/pjproject/pjsip/include/pjsip.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h b/daemon/libs/pjproject/pjsip/include/pjsip/print_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/print_util.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/print_util.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_auth.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_aka.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_msg.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_auth_parser.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in b/daemon/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_autoconf.h.in
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_config.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_config.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_dialog.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_endpoint.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_errno.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_errno.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_errno.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_event.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_event.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_event.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_module.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_module.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_module.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_msg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_msg.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_msg.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_parser.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_parser.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_parser.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_private.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_private.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_private.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_resolve.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_tel_uri.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transaction.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transport.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transport.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_loop.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_tcp.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_tls.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_transport_udp.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_types.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_types.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_ua_layer.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_uri.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_uri.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_uri.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h b/daemon/libs/pjproject/pjsip/include/pjsip/sip_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip/sip_util.h
rename to daemon/libs/pjproject/pjsip/include/pjsip/sip_util.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h b/daemon/libs/pjproject/pjsip/include/pjsip_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip_auth.h
rename to daemon/libs/pjproject/pjsip/include/pjsip_auth.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h b/daemon/libs/pjproject/pjsip/include/pjsip_simple.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip_simple.h
rename to daemon/libs/pjproject/pjsip/include/pjsip_simple.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h b/daemon/libs/pjproject/pjsip/include/pjsip_ua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsip_ua.h
rename to daemon/libs/pjproject/pjsip/include/pjsip_ua.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h b/daemon/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
rename to daemon/libs/pjproject/pjsip/include/pjsua-lib/pjsua.h
diff --git a/sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h b/daemon/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
rename to daemon/libs/pjproject/pjsip/include/pjsua-lib/pjsua_internal.h
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/errno.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/errno.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/evsub.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/evsub_msg.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/iscomposing.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/mwi.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/pidf.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/presence.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/presence.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/presence_body.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/publishc.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/rpid.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c b/daemon/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-simple/xpidf.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_100rel.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_inv.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_reg.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_replaces.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_timer.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c b/daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
rename to daemon/libs/pjproject/pjsip/src/pjsip-ua/sip_xfer.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_aka.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_client.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_msg.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_parser.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_auth_server.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_config.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_config.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_config.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_dialog.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_endpoint.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_errno.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_errno.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_errno.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_msg.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_msg.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_msg.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_parser.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_parser.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_resolve.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_tel_uri.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transaction.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_loop.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tcp.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tls.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_tls_ossl.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_udp.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_ua_layer.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_uri.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_uri.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_uri.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_util.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_util_proxy.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c b/daemon/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_util_statefull.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp b/daemon/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
rename to daemon/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_acc.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_call.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_core.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_im.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_media.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c b/daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
rename to daemon/libs/pjproject/pjsip/src/pjsua-lib/pjsua_pres.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c b/daemon/libs/pjproject/pjsip/src/test/dlg_core_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/dlg_core_test.c
rename to daemon/libs/pjproject/pjsip/src/test/dlg_core_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c b/daemon/libs/pjproject/pjsip/src/test/dns_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/dns_test.c
rename to daemon/libs/pjproject/pjsip/src/test/dns_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c b/daemon/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
rename to daemon/libs/pjproject/pjsip/src/test/inv_offer_answer_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/main.c b/daemon/libs/pjproject/pjsip/src/test/main.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/main.c
rename to daemon/libs/pjproject/pjsip/src/test/main.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/main_rtems.c b/daemon/libs/pjproject/pjsip/src/test/main_rtems.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/main_rtems.c
rename to daemon/libs/pjproject/pjsip/src/test/main_rtems.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/main_win32.c b/daemon/libs/pjproject/pjsip/src/test/main_win32.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/main_win32.c
rename to daemon/libs/pjproject/pjsip/src/test/main_win32.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c b/daemon/libs/pjproject/pjsip/src/test/msg_err_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/msg_err_test.c
rename to daemon/libs/pjproject/pjsip/src/test/msg_err_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c b/daemon/libs/pjproject/pjsip/src/test/msg_logger.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/msg_logger.c
rename to daemon/libs/pjproject/pjsip/src/test/msg_logger.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c b/daemon/libs/pjproject/pjsip/src/test/msg_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/msg_test.c
rename to daemon/libs/pjproject/pjsip/src/test/msg_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c b/daemon/libs/pjproject/pjsip/src/test/regc_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/regc_test.c
rename to daemon/libs/pjproject/pjsip/src/test/regc_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/test.c b/daemon/libs/pjproject/pjsip/src/test/test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/test.c
rename to daemon/libs/pjproject/pjsip/src/test/test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/test.h b/daemon/libs/pjproject/pjsip/src/test/test.h
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/test.h
rename to daemon/libs/pjproject/pjsip/src/test/test.h
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c b/daemon/libs/pjproject/pjsip/src/test/transport_loop_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/transport_loop_test.c
rename to daemon/libs/pjproject/pjsip/src/test/transport_loop_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c b/daemon/libs/pjproject/pjsip/src/test/transport_tcp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/transport_tcp_test.c
rename to daemon/libs/pjproject/pjsip/src/test/transport_tcp_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c b/daemon/libs/pjproject/pjsip/src/test/transport_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/transport_test.c
rename to daemon/libs/pjproject/pjsip/src/test/transport_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c b/daemon/libs/pjproject/pjsip/src/test/transport_udp_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/transport_udp_test.c
rename to daemon/libs/pjproject/pjsip/src/test/transport_udp_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c b/daemon/libs/pjproject/pjsip/src/test/tsx_basic_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/tsx_basic_test.c
rename to daemon/libs/pjproject/pjsip/src/test/tsx_basic_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c b/daemon/libs/pjproject/pjsip/src/test/tsx_bench.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/tsx_bench.c
rename to daemon/libs/pjproject/pjsip/src/test/tsx_bench.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c b/daemon/libs/pjproject/pjsip/src/test/tsx_uac_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/tsx_uac_test.c
rename to daemon/libs/pjproject/pjsip/src/test/tsx_uac_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c b/daemon/libs/pjproject/pjsip/src/test/tsx_uas_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/tsx_uas_test.c
rename to daemon/libs/pjproject/pjsip/src/test/tsx_uas_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c b/daemon/libs/pjproject/pjsip/src/test/txdata_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/txdata_test.c
rename to daemon/libs/pjproject/pjsip/src/test/txdata_test.c
diff --git a/sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c b/daemon/libs/pjproject/pjsip/src/test/uri_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/pjsip/src/test/uri_test.c
rename to daemon/libs/pjproject/pjsip/src/test/uri_test.c
diff --git a/sflphone-common/libs/pjproject/self-test.mak b/daemon/libs/pjproject/self-test.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/self-test.mak
rename to daemon/libs/pjproject/self-test.mak
diff --git a/sflphone-common/libs/pjproject/svn_add b/daemon/libs/pjproject/svn_add
similarity index 100%
rename from sflphone-common/libs/pjproject/svn_add
rename to daemon/libs/pjproject/svn_add
diff --git a/sflphone-common/libs/pjproject/svn_pset b/daemon/libs/pjproject/svn_pset
similarity index 100%
rename from sflphone-common/libs/pjproject/svn_pset
rename to daemon/libs/pjproject/svn_pset
diff --git a/sflphone-common/libs/pjproject/tests/cdash/README.TXT b/daemon/libs/pjproject/tests/cdash/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/README.TXT
rename to daemon/libs/pjproject/tests/cdash/README.TXT
diff --git a/sflphone-common/libs/pjproject/tests/cdash/builder.py b/daemon/libs/pjproject/tests/cdash/builder.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/builder.py
rename to daemon/libs/pjproject/tests/cdash/builder.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/cfg_gnu.py b/daemon/libs/pjproject/tests/cdash/cfg_gnu.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/cfg_gnu.py
rename to daemon/libs/pjproject/tests/cdash/cfg_gnu.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/cfg_msvc.py b/daemon/libs/pjproject/tests/cdash/cfg_msvc.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/cfg_msvc.py
rename to daemon/libs/pjproject/tests/cdash/cfg_msvc.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/cfg_site_sample.py b/daemon/libs/pjproject/tests/cdash/cfg_site_sample.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/cfg_site_sample.py
rename to daemon/libs/pjproject/tests/cdash/cfg_site_sample.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/cfg_symbian.py b/daemon/libs/pjproject/tests/cdash/cfg_symbian.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/cfg_symbian.py
rename to daemon/libs/pjproject/tests/cdash/cfg_symbian.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/inc_test.py b/daemon/libs/pjproject/tests/cdash/inc_test.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/inc_test.py
rename to daemon/libs/pjproject/tests/cdash/inc_test.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/main.py b/daemon/libs/pjproject/tests/cdash/main.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/main.py
rename to daemon/libs/pjproject/tests/cdash/main.py
diff --git a/sflphone-common/libs/pjproject/tests/cdash/starttest_sample.bat b/daemon/libs/pjproject/tests/cdash/starttest_sample.bat
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/cdash/starttest_sample.bat
rename to daemon/libs/pjproject/tests/cdash/starttest_sample.bat
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/README.TXT b/daemon/libs/pjproject/tests/pjsua/README.TXT
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/README.TXT
rename to daemon/libs/pjproject/tests/pjsua/README.TXT
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/config_site.py b/daemon/libs/pjproject/tests/pjsua/config_site.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/config_site.py
rename to daemon/libs/pjproject/tests/pjsua/config_site.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/inc_cfg.py b/daemon/libs/pjproject/tests/pjsua/inc_cfg.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/inc_cfg.py
rename to daemon/libs/pjproject/tests/pjsua/inc_cfg.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/inc_const.py b/daemon/libs/pjproject/tests/pjsua/inc_const.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/inc_const.py
rename to daemon/libs/pjproject/tests/pjsua/inc_const.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/inc_sdp.py b/daemon/libs/pjproject/tests/pjsua/inc_sdp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/inc_sdp.py
rename to daemon/libs/pjproject/tests/pjsua/inc_sdp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/inc_sip.py b/daemon/libs/pjproject/tests/pjsua/inc_sip.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/inc_sip.py
rename to daemon/libs/pjproject/tests/pjsua/inc_sip.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_call.py b/daemon/libs/pjproject/tests/pjsua/mod_call.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_call.py
rename to daemon/libs/pjproject/tests/pjsua/mod_call.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_media_playrec.py b/daemon/libs/pjproject/tests/pjsua/mod_media_playrec.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_media_playrec.py
rename to daemon/libs/pjproject/tests/pjsua/mod_media_playrec.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_pesq.py b/daemon/libs/pjproject/tests/pjsua/mod_pesq.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_pesq.py
rename to daemon/libs/pjproject/tests/pjsua/mod_pesq.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_pres.py b/daemon/libs/pjproject/tests/pjsua/mod_pres.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_pres.py
rename to daemon/libs/pjproject/tests/pjsua/mod_pres.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_recvfrom.py b/daemon/libs/pjproject/tests/pjsua/mod_recvfrom.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_recvfrom.py
rename to daemon/libs/pjproject/tests/pjsua/mod_recvfrom.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_run.py b/daemon/libs/pjproject/tests/pjsua/mod_run.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_run.py
rename to daemon/libs/pjproject/tests/pjsua/mod_run.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/mod_sendto.py b/daemon/libs/pjproject/tests/pjsua/mod_sendto.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/mod_sendto.py
rename to daemon/libs/pjproject/tests/pjsua/mod_sendto.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/run.py b/daemon/libs/pjproject/tests/pjsua/run.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/run.py
rename to daemon/libs/pjproject/tests/pjsua/run.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/runall.py b/daemon/libs/pjproject/tests/pjsua/runall.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/runall.py
rename to daemon/libs/pjproject/tests/pjsua/runall.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/100_simplecall.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/100_simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/100_simplecall.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/100_simplecall.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_0_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_0_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_0_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_0_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_0.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_0.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_0.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_1_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/150_srtp_2_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/200_tcp.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/200_tcp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/200_tcp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/200_tcp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_0_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_0_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_0_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_0_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_0.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_0.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_0.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/300_ice_1_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_a.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_a.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_a.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_a.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_b.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_b.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_b.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/301_ice_public_b.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_1_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_1_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_1_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_2_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_2_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_2_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/305_ice_comp_2_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/350_prack_a.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/350_prack_a.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/350_prack_a.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/350_prack_a.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-call/350_prack_b.py b/daemon/libs/pjproject/tests/pjsua/scripts-call/350_prack_b.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-call/350_prack_b.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-call/350_prack_b.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py b/daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/100_defaults.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/100_defaults.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/100_defaults.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/100_defaults.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/101_defaults.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/101_defaults.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/101_defaults.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/101_defaults.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711a.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711a.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711a.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711a.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711u.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711u.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711u.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g711u.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g722.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g722.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g722.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_g722.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_gsm.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_gsm.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_gsm.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_gsm.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_ilbc.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_ilbc.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_ilbc.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_ilbc.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_16000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_16000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_8000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/200_codec_speex_8000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711a.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711a.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711a.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711a.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711u.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711u.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711u.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g711u.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g722.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g722.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g722.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_g722.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_gsm.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_gsm.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_gsm.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_gsm.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_ilbc.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_ilbc.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_ilbc.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_ilbc.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_16000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_16000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_8000.py b/daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pesq/201_codec_speex_8000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pres/100_peertopeer.py b/daemon/libs/pjproject/tests/pjsua/scripts-pres/100_peertopeer.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pres/100_peertopeer.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pres/100_peertopeer.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-pres/200_publish.py b/daemon/libs/pjproject/tests/pjsua/scripts-pres/200_publish.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-pres/200_publish.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-pres/200_publish.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/240_publish_scenarios.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/240_publish_scenarios.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/240_publish_scenarios.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/240_publish_scenarios.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/300_timer_good.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/300_timer_good.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/300_timer_good.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/300_timer_good.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/301_timer_good_retry_after_422.py b/daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/301_timer_good_retry_after_422.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-recvfrom/301_timer_good_retry_after_422.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-recvfrom/301_timer_good_retry_after_422.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-run/100_simple.py b/daemon/libs/pjproject/tests/pjsua/scripts-run/100_simple.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-run/100_simple.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-run/100_simple.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-run/200_register.py b/daemon/libs/pjproject/tests/pjsua/scripts-run/200_register.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-run/200_register.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-run/200_register.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/100_simplecall.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/100_simplecall.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/100_simplecall.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/100_simplecall.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/110_tel_uri.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/110_tel_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/110_tel_uri.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/110_tel_uri.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/126_sdp_with_port_0_and_no_rtpmap_for_dynamic_pt.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/126_sdp_with_port_0_and_no_rtpmap_for_dynamic_pt.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/126_sdp_with_port_0_and_no_rtpmap_for_dynamic_pt.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/126_sdp_with_port_0_and_no_rtpmap_for_dynamic_pt.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/150_err_extension.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/150_err_extension.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/150_err_extension.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/150_err_extension.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/151_err_sdp_video.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/151_err_sdp_video.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/151_err_sdp_video.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/151_err_sdp_video.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport_nit.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport_nit.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport_nit.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/159_no_rport_nit.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/170_timer_required.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/170_timer_required.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/170_timer_required.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/170_timer_required.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/171_timer_initiated_by_uas.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/171_timer_initiated_by_uas.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/171_timer_initiated_by_uas.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/171_timer_initiated_by_uas.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/172_timer_supported_but_not_used.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/172_timer_supported_but_not_used.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/172_timer_supported_but_not_used.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/172_timer_supported_but_not_used.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_no_refresher.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_no_refresher.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_no_refresher.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_no_refresher.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uac.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uac.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uac.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uac.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uas.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uas.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uas.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/173_timer_offer_refresher_uas.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/174_timer_se_too_small.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/174_timer_se_too_small.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/174_timer_se_too_small.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/174_timer_se_too_small.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_no_ice.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_no_ice.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_no_ice.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_no_ice.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_3.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_3.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_3.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_4.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_4.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_4.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/200_ice_success_4.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/360_non_sip_uri.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/360_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/360_non_sip_uri.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/360_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/361_non_sip_uri.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/361_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/361_non_sip_uri.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/361_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/362_non_sip_uri.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/362_non_sip_uri.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/362_non_sip_uri.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/362_non_sip_uri.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/999_asterisk_err.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/999_asterisk_err.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/999_asterisk_err.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/999_asterisk_err.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/999_message_no_body.py b/daemon/libs/pjproject/tests/pjsua/scripts-sendto/999_message_no_body.py
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sendto/999_message_no_body.py
rename to daemon/libs/pjproject/tests/pjsua/scripts-sendto/999_message_no_body.py
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/prack_fork.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/prack_fork.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/prack_fork.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/prack_fork.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/strict-route.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/strict-route.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/strict-route.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/strict-route.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-bad-ack.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-bad-ack.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-bad-ack.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-bad-ack.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-inv-multiple-require.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-inv-multiple-require.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-inv-multiple-require.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-inv-multiple-require.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-message-no-body.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-message-no-body.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-message-no-body.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-message-no-body.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-options.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-options.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-options.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-options.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-port-0-bad-sdp.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-port-0-bad-sdp.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-port-0-bad-sdp.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-reinvite-port-0-bad-sdp.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-subscribe.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-subscribe.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uac-subscribe.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uac-subscribe.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-422-then-200-bad-se.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-422-then-200-bad-se.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-422-then-200-bad-se.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-422-then-200-bad-se.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-auth.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-auth.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-auth.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-auth.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-early-bye.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-early-bye.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-early-bye.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-early-bye.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-invite.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-invite.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-invite.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-invite.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi-0.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi-0.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi-0.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi-0.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-mwi.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-template.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-template.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas-template.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas-template.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas.xml b/daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas.xml
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/scripts-sipp/uas.xml
rename to daemon/libs/pjproject/tests/pjsua/scripts-sipp/uas.xml
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/tools/Makefile b/daemon/libs/pjproject/tests/pjsua/tools/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/tools/Makefile
rename to daemon/libs/pjproject/tests/pjsua/tools/Makefile
diff --git a/sflphone-common/libs/pjproject/tests/pjsua/tools/cmp_wav.c b/daemon/libs/pjproject/tests/pjsua/tools/cmp_wav.c
similarity index 100%
rename from sflphone-common/libs/pjproject/tests/pjsua/tools/cmp_wav.c
rename to daemon/libs/pjproject/tests/pjsua/tools/cmp_wav.c
diff --git a/sflphone-common/libs/pjproject/third_party/README.txt b/daemon/libs/pjproject/third_party/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/README.txt
rename to daemon/libs/pjproject/third_party/README.txt
diff --git a/sflphone-common/libs/pjproject/third_party/build/Makefile b/daemon/libs/pjproject/third_party/build/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/Makefile
rename to daemon/libs/pjproject/third_party/build/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/gsm/Makefile b/daemon/libs/pjproject/third_party/build/gsm/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/gsm/Makefile
rename to daemon/libs/pjproject/third_party/build/gsm/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/gsm/config.h b/daemon/libs/pjproject/third_party/build/gsm/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/gsm/config.h
rename to daemon/libs/pjproject/third_party/build/gsm/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.dsp b/daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.dsp
rename to daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.vcp b/daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.vcp
rename to daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.vcproj b/daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/gsm/libgsmcodec.vcproj
rename to daemon/libs/pjproject/third_party/build/gsm/libgsmcodec.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/ilbc/Makefile b/daemon/libs/pjproject/third_party/build/ilbc/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/ilbc/Makefile
rename to daemon/libs/pjproject/third_party/build/ilbc/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.dsp b/daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.dsp
rename to daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.vcp b/daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.vcp
rename to daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.vcproj b/daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/ilbc/libilbccodec.vcproj
rename to daemon/libs/pjproject/third_party/build/ilbc/libilbccodec.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/os-auto.mak.in b/daemon/libs/pjproject/third_party/build/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/os-auto.mak.in
rename to daemon/libs/pjproject/third_party/build/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/third_party/build/os-darwinos.mak b/daemon/libs/pjproject/third_party/build/os-darwinos.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/os-darwinos.mak
rename to daemon/libs/pjproject/third_party/build/os-darwinos.mak
diff --git a/sflphone-common/libs/pjproject/third_party/build/os-linux.mak b/daemon/libs/pjproject/third_party/build/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/os-linux.mak
rename to daemon/libs/pjproject/third_party/build/os-linux.mak
diff --git a/sflphone-common/libs/pjproject/third_party/build/os-win32.mak b/daemon/libs/pjproject/third_party/build/os-win32.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/os-win32.mak
rename to daemon/libs/pjproject/third_party/build/os-win32.mak
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/Makefile b/daemon/libs/pjproject/third_party/build/portaudio/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/Makefile
rename to daemon/libs/pjproject/third_party/build/portaudio/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.dsp b/daemon/libs/pjproject/third_party/build/portaudio/libportaudio.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.dsp
rename to daemon/libs/pjproject/third_party/build/portaudio/libportaudio.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.vcp b/daemon/libs/pjproject/third_party/build/portaudio/libportaudio.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.vcp
rename to daemon/libs/pjproject/third_party/build/portaudio/libportaudio.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.vcproj b/daemon/libs/pjproject/third_party/build/portaudio/libportaudio.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/libportaudio.vcproj
rename to daemon/libs/pjproject/third_party/build/portaudio/libportaudio.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/os-auto.mak.in b/daemon/libs/pjproject/third_party/build/portaudio/os-auto.mak.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/os-auto.mak.in
rename to daemon/libs/pjproject/third_party/build/portaudio/os-auto.mak.in
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/os-linux.mak b/daemon/libs/pjproject/third_party/build/portaudio/os-linux.mak
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/os-linux.mak
rename to daemon/libs/pjproject/third_party/build/portaudio/os-linux.mak
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_allocation.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_allocation.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_allocation.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_allocation.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_allocation.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_allocation.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_allocation.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_converters.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_converters.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_converters.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_converters.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_converters.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_converters.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_cpuload.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_debugprint.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_dither.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_dither.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_dither.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_dither.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_dither.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_dither.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_dither.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_dither.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_endianness.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_endianness.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_endianness.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_endianness.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_front.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_front.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_front.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_front.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_hostapi.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_hostapi.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_hostapi.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_hostapi.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_linux_alsa.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_blocking.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_internal.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_internal.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_internal.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_old.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_old.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_old.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_old.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_core_utilities.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_hostapis.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_mac_hostapis.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_mac_hostapis.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_process.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_process.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_process.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_process.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_process.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_process.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_process.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_process.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_ringbuffer.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_skeleton.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_skeleton.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_skeleton.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_skeleton.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_stream.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_stream.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_stream.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_stream.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_stream.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_stream.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_stream.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_trace.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_trace.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_trace.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_trace.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_trace.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_trace.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_trace.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_trace.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_types.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_types.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_types.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_hostapis.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_hostapis.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_hostapis.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_oss.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_oss.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_oss.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_oss.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_unix_util.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_util.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_util.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_util.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_hostapis.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_hostapis.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_hostapis.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_util.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_util.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_util.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_waveformat.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.c b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.c
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.c
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.h b/daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/pa_win_wmme.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/portaudio/src/portaudio.h b/daemon/libs/pjproject/third_party/build/portaudio/src/portaudio.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/portaudio/src/portaudio.h
rename to daemon/libs/pjproject/third_party/build/portaudio/src/portaudio.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/Makefile b/daemon/libs/pjproject/third_party/build/resample/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/Makefile
rename to daemon/libs/pjproject/third_party/build/resample/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/config.h b/daemon/libs/pjproject/third_party/build/resample/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/config.h
rename to daemon/libs/pjproject/third_party/build/resample/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/libresample.dsp b/daemon/libs/pjproject/third_party/build/resample/libresample.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/libresample.dsp
rename to daemon/libs/pjproject/third_party/build/resample/libresample.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/libresample.vcp b/daemon/libs/pjproject/third_party/build/resample/libresample.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/libresample.vcp
rename to daemon/libs/pjproject/third_party/build/resample/libresample.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/libresample.vcproj b/daemon/libs/pjproject/third_party/build/resample/libresample.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/libresample.vcproj
rename to daemon/libs/pjproject/third_party/build/resample/libresample.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/libresample_dll.dsp b/daemon/libs/pjproject/third_party/build/resample/libresample_dll.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/libresample_dll.dsp
rename to daemon/libs/pjproject/third_party/build/resample/libresample_dll.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/resample/libresample_dll.vcproj b/daemon/libs/pjproject/third_party/build/resample/libresample_dll.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/resample/libresample_dll.vcproj
rename to daemon/libs/pjproject/third_party/build/resample/libresample_dll.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/samplerate/README.txt b/daemon/libs/pjproject/third_party/build/samplerate/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/samplerate/README.txt
rename to daemon/libs/pjproject/third_party/build/samplerate/README.txt
diff --git a/sflphone-common/libs/pjproject/third_party/build/samplerate/Static.msvc b/daemon/libs/pjproject/third_party/build/samplerate/Static.msvc
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/samplerate/Static.msvc
rename to daemon/libs/pjproject/third_party/build/samplerate/Static.msvc
diff --git a/sflphone-common/libs/pjproject/third_party/build/samplerate/libsamplerate_static.dsp b/daemon/libs/pjproject/third_party/build/samplerate/libsamplerate_static.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/samplerate/libsamplerate_static.dsp
rename to daemon/libs/pjproject/third_party/build/samplerate/libsamplerate_static.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/Makefile b/daemon/libs/pjproject/third_party/build/speex/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/Makefile
rename to daemon/libs/pjproject/third_party/build/speex/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/config.h b/daemon/libs/pjproject/third_party/build/speex/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/config.h
rename to daemon/libs/pjproject/third_party/build/speex/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/libspeex.dsp b/daemon/libs/pjproject/third_party/build/speex/libspeex.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/libspeex.dsp
rename to daemon/libs/pjproject/third_party/build/speex/libspeex.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/libspeex.vcp b/daemon/libs/pjproject/third_party/build/speex/libspeex.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/libspeex.vcp
rename to daemon/libs/pjproject/third_party/build/speex/libspeex.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/libspeex.vcproj b/daemon/libs/pjproject/third_party/build/speex/libspeex.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/libspeex.vcproj
rename to daemon/libs/pjproject/third_party/build/speex/libspeex.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/speex/speex/speex_config_types.h b/daemon/libs/pjproject/third_party/build/speex/speex/speex_config_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/speex/speex/speex_config_types.h
rename to daemon/libs/pjproject/third_party/build/speex/speex/speex_config_types.h
diff --git a/sflphone-common/libs/pjproject/third_party/build/srtp/Makefile b/daemon/libs/pjproject/third_party/build/srtp/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/srtp/Makefile
rename to daemon/libs/pjproject/third_party/build/srtp/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.dsp b/daemon/libs/pjproject/third_party/build/srtp/libsrtp.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.dsp
rename to daemon/libs/pjproject/third_party/build/srtp/libsrtp.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.vcp b/daemon/libs/pjproject/third_party/build/srtp/libsrtp.vcp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.vcp
rename to daemon/libs/pjproject/third_party/build/srtp/libsrtp.vcp
diff --git a/sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.vcproj b/daemon/libs/pjproject/third_party/build/srtp/libsrtp.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/srtp/libsrtp.vcproj
rename to daemon/libs/pjproject/third_party/build/srtp/libsrtp.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/build/srtp/srtp_config.h b/daemon/libs/pjproject/third_party/build/srtp/srtp_config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/build/srtp/srtp_config.h
rename to daemon/libs/pjproject/third_party/build/srtp/srtp_config.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/COPYRIGHT b/daemon/libs/pjproject/third_party/gsm/COPYRIGHT
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/COPYRIGHT
rename to daemon/libs/pjproject/third_party/gsm/COPYRIGHT
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/ChangeLog b/daemon/libs/pjproject/third_party/gsm/ChangeLog
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/ChangeLog
rename to daemon/libs/pjproject/third_party/gsm/ChangeLog
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/INSTALL b/daemon/libs/pjproject/third_party/gsm/INSTALL
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/INSTALL
rename to daemon/libs/pjproject/third_party/gsm/INSTALL
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/MACHINES b/daemon/libs/pjproject/third_party/gsm/MACHINES
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/MACHINES
rename to daemon/libs/pjproject/third_party/gsm/MACHINES
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/MANIFEST b/daemon/libs/pjproject/third_party/gsm/MANIFEST
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/MANIFEST
rename to daemon/libs/pjproject/third_party/gsm/MANIFEST
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/Makefile b/daemon/libs/pjproject/third_party/gsm/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/Makefile
rename to daemon/libs/pjproject/third_party/gsm/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/README b/daemon/libs/pjproject/third_party/gsm/README
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/README
rename to daemon/libs/pjproject/third_party/gsm/README
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/add-test/add_test.c b/daemon/libs/pjproject/third_party/gsm/add-test/add_test.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/add-test/add_test.c
rename to daemon/libs/pjproject/third_party/gsm/add-test/add_test.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/add-test/add_test.dta b/daemon/libs/pjproject/third_party/gsm/add-test/add_test.dta
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/add-test/add_test.dta
rename to daemon/libs/pjproject/third_party/gsm/add-test/add_test.dta
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/config.h b/daemon/libs/pjproject/third_party/gsm/inc/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/config.h
rename to daemon/libs/pjproject/third_party/gsm/inc/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/gsm.h b/daemon/libs/pjproject/third_party/gsm/inc/gsm.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/gsm.h
rename to daemon/libs/pjproject/third_party/gsm/inc/gsm.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/private.h b/daemon/libs/pjproject/third_party/gsm/inc/private.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/private.h
rename to daemon/libs/pjproject/third_party/gsm/inc/private.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/proto.h b/daemon/libs/pjproject/third_party/gsm/inc/proto.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/proto.h
rename to daemon/libs/pjproject/third_party/gsm/inc/proto.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/toast.h b/daemon/libs/pjproject/third_party/gsm/inc/toast.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/toast.h
rename to daemon/libs/pjproject/third_party/gsm/inc/toast.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/inc/unproto.h b/daemon/libs/pjproject/third_party/gsm/inc/unproto.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/inc/unproto.h
rename to daemon/libs/pjproject/third_party/gsm/inc/unproto.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/man/gsm.3 b/daemon/libs/pjproject/third_party/gsm/man/gsm.3
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/man/gsm.3
rename to daemon/libs/pjproject/third_party/gsm/man/gsm.3
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/man/gsm_explode.3 b/daemon/libs/pjproject/third_party/gsm/man/gsm_explode.3
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/man/gsm_explode.3
rename to daemon/libs/pjproject/third_party/gsm/man/gsm_explode.3
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/man/gsm_option.3 b/daemon/libs/pjproject/third_party/gsm/man/gsm_option.3
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/man/gsm_option.3
rename to daemon/libs/pjproject/third_party/gsm/man/gsm_option.3
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/man/gsm_print.3 b/daemon/libs/pjproject/third_party/gsm/man/gsm_print.3
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/man/gsm_print.3
rename to daemon/libs/pjproject/third_party/gsm/man/gsm_print.3
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/add.c b/daemon/libs/pjproject/third_party/gsm/src/add.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/add.c
rename to daemon/libs/pjproject/third_party/gsm/src/add.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/code.c b/daemon/libs/pjproject/third_party/gsm/src/code.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/code.c
rename to daemon/libs/pjproject/third_party/gsm/src/code.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/debug.c b/daemon/libs/pjproject/third_party/gsm/src/debug.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/debug.c
rename to daemon/libs/pjproject/third_party/gsm/src/debug.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/decode.c b/daemon/libs/pjproject/third_party/gsm/src/decode.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/decode.c
rename to daemon/libs/pjproject/third_party/gsm/src/decode.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_create.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_create.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_create.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_create.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_decode.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_decode.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_decode.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_decode.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_destroy.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_destroy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_destroy.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_destroy.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_encode.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_encode.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_encode.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_encode.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_explode.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_explode.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_explode.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_explode.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_implode.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_implode.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_implode.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_implode.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_option.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_option.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_option.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_option.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/gsm_print.c b/daemon/libs/pjproject/third_party/gsm/src/gsm_print.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/gsm_print.c
rename to daemon/libs/pjproject/third_party/gsm/src/gsm_print.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/long_term.c b/daemon/libs/pjproject/third_party/gsm/src/long_term.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/long_term.c
rename to daemon/libs/pjproject/third_party/gsm/src/long_term.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/lpc.c b/daemon/libs/pjproject/third_party/gsm/src/lpc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/lpc.c
rename to daemon/libs/pjproject/third_party/gsm/src/lpc.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/preprocess.c b/daemon/libs/pjproject/third_party/gsm/src/preprocess.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/preprocess.c
rename to daemon/libs/pjproject/third_party/gsm/src/preprocess.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/rpe.c b/daemon/libs/pjproject/third_party/gsm/src/rpe.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/rpe.c
rename to daemon/libs/pjproject/third_party/gsm/src/rpe.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/short_term.c b/daemon/libs/pjproject/third_party/gsm/src/short_term.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/short_term.c
rename to daemon/libs/pjproject/third_party/gsm/src/short_term.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/table.c b/daemon/libs/pjproject/third_party/gsm/src/table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/table.c
rename to daemon/libs/pjproject/third_party/gsm/src/table.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/toast.c b/daemon/libs/pjproject/third_party/gsm/src/toast.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/toast.c
rename to daemon/libs/pjproject/third_party/gsm/src/toast.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/toast_alaw.c b/daemon/libs/pjproject/third_party/gsm/src/toast_alaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/toast_alaw.c
rename to daemon/libs/pjproject/third_party/gsm/src/toast_alaw.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/toast_audio.c b/daemon/libs/pjproject/third_party/gsm/src/toast_audio.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/toast_audio.c
rename to daemon/libs/pjproject/third_party/gsm/src/toast_audio.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/toast_lin.c b/daemon/libs/pjproject/third_party/gsm/src/toast_lin.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/toast_lin.c
rename to daemon/libs/pjproject/third_party/gsm/src/toast_lin.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/src/toast_ulaw.c b/daemon/libs/pjproject/third_party/gsm/src/toast_ulaw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/src/toast_ulaw.c
rename to daemon/libs/pjproject/third_party/gsm/src/toast_ulaw.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/bitter.c b/daemon/libs/pjproject/third_party/gsm/tls/bitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/bitter.c
rename to daemon/libs/pjproject/third_party/gsm/tls/bitter.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/bitter.dta b/daemon/libs/pjproject/third_party/gsm/tls/bitter.dta
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/bitter.dta
rename to daemon/libs/pjproject/third_party/gsm/tls/bitter.dta
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/ginger.c b/daemon/libs/pjproject/third_party/gsm/tls/ginger.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/ginger.c
rename to daemon/libs/pjproject/third_party/gsm/tls/ginger.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/sour.c b/daemon/libs/pjproject/third_party/gsm/tls/sour.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/sour.c
rename to daemon/libs/pjproject/third_party/gsm/tls/sour.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/sour1.dta b/daemon/libs/pjproject/third_party/gsm/tls/sour1.dta
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/sour1.dta
rename to daemon/libs/pjproject/third_party/gsm/tls/sour1.dta
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/sour2.dta b/daemon/libs/pjproject/third_party/gsm/tls/sour2.dta
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/sour2.dta
rename to daemon/libs/pjproject/third_party/gsm/tls/sour2.dta
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/sweet.c b/daemon/libs/pjproject/third_party/gsm/tls/sweet.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/sweet.c
rename to daemon/libs/pjproject/third_party/gsm/tls/sweet.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/taste.c b/daemon/libs/pjproject/third_party/gsm/tls/taste.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/taste.c
rename to daemon/libs/pjproject/third_party/gsm/tls/taste.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tls/taste.h b/daemon/libs/pjproject/third_party/gsm/tls/taste.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tls/taste.h
rename to daemon/libs/pjproject/third_party/gsm/tls/taste.h
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/cod2lin.c b/daemon/libs/pjproject/third_party/gsm/tst/cod2lin.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/cod2lin.c
rename to daemon/libs/pjproject/third_party/gsm/tst/cod2lin.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/cod2txt.c b/daemon/libs/pjproject/third_party/gsm/tst/cod2txt.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/cod2txt.c
rename to daemon/libs/pjproject/third_party/gsm/tst/cod2txt.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/gsm2cod.c b/daemon/libs/pjproject/third_party/gsm/tst/gsm2cod.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/gsm2cod.c
rename to daemon/libs/pjproject/third_party/gsm/tst/gsm2cod.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/lin2cod.c b/daemon/libs/pjproject/third_party/gsm/tst/lin2cod.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/lin2cod.c
rename to daemon/libs/pjproject/third_party/gsm/tst/lin2cod.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/lin2txt.c b/daemon/libs/pjproject/third_party/gsm/tst/lin2txt.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/lin2txt.c
rename to daemon/libs/pjproject/third_party/gsm/tst/lin2txt.c
diff --git a/sflphone-common/libs/pjproject/third_party/gsm/tst/run b/daemon/libs/pjproject/third_party/gsm/tst/run
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/gsm/tst/run
rename to daemon/libs/pjproject/third_party/gsm/tst/run
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/Doxyfile b/daemon/libs/pjproject/third_party/portaudio/Doxyfile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/Doxyfile
rename to daemon/libs/pjproject/third_party/portaudio/Doxyfile
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/LICENSE.txt b/daemon/libs/pjproject/third_party/portaudio/LICENSE.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/LICENSE.txt
rename to daemon/libs/pjproject/third_party/portaudio/LICENSE.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/README.txt b/daemon/libs/pjproject/third_party/portaudio/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/README.txt
rename to daemon/libs/pjproject/third_party/portaudio/README.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/SConstruct b/daemon/libs/pjproject/third_party/portaudio/SConstruct
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/SConstruct
rename to daemon/libs/pjproject/third_party/portaudio/SConstruct
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-dll b/daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-dll
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-dll
rename to daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-dll
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-static b/daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-static
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-static
rename to daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/Makefile-static
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-dll.dev b/daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
rename to daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-dll.dev
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-static.dev b/daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-static.dev
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-static.dev
rename to daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/portaudio-static.dev
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/readme.txt b/daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/dev-cpp/readme.txt
rename to daemon/libs/pjproject/third_party/portaudio/build/dev-cpp/readme.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.def b/daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.def
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.def
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.def
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsp b/daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsp
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsp
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsw b/daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsw
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsw
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.dsw
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.sln b/daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.sln
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.sln
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.sln
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.vcproj b/daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/portaudio.vcproj
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/portaudio.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/readme.txt b/daemon/libs/pjproject/third_party/portaudio/build/msvc/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/msvc/readme.txt
rename to daemon/libs/pjproject/third_party/portaudio/build/msvc/readme.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/scons/SConscript_common b/daemon/libs/pjproject/third_party/portaudio/build/scons/SConscript_common
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/scons/SConscript_common
rename to daemon/libs/pjproject/third_party/portaudio/build/scons/SConscript_common
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/build/scons/SConscript_opts b/daemon/libs/pjproject/third_party/portaudio/build/scons/SConscript_opts
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/build/scons/SConscript_opts
rename to daemon/libs/pjproject/third_party/portaudio/build/scons/SConscript_opts
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/config.guess b/daemon/libs/pjproject/third_party/portaudio/config.guess
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/config.guess
rename to daemon/libs/pjproject/third_party/portaudio/config.guess
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/config.sub b/daemon/libs/pjproject/third_party/portaudio/config.sub
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/config.sub
rename to daemon/libs/pjproject/third_party/portaudio/config.sub
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/configure b/daemon/libs/pjproject/third_party/portaudio/configure
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/configure
rename to daemon/libs/pjproject/third_party/portaudio/configure
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/configure.in b/daemon/libs/pjproject/third_party/portaudio/configure.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/configure.in
rename to daemon/libs/pjproject/third_party/portaudio/configure.in
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/depcomp b/daemon/libs/pjproject/third_party/portaudio/depcomp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/depcomp
rename to daemon/libs/pjproject/third_party/portaudio/depcomp
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/fixdir.bat b/daemon/libs/pjproject/third_party/portaudio/fixdir.bat
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/fixdir.bat
rename to daemon/libs/pjproject/third_party/portaudio/fixdir.bat
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/fixfile.bat b/daemon/libs/pjproject/third_party/portaudio/fixfile.bat
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/fixfile.bat
rename to daemon/libs/pjproject/third_party/portaudio/fixfile.bat
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_asio.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_asio.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_asio.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_asio.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_jack.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_jack.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_jack.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_jack.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_linux_alsa.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_linux_alsa.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_linux_alsa.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_linux_alsa.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_mac_core.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_mac_core.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_mac_core.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_mac_core.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_ds.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_win_ds.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_ds.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_win_ds.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_waveformat.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_win_waveformat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_waveformat.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_win_waveformat.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_wmme.h b/daemon/libs/pjproject/third_party/portaudio/include/pa_win_wmme.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/pa_win_wmme.h
rename to daemon/libs/pjproject/third_party/portaudio/include/pa_win_wmme.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/include/portaudio.h b/daemon/libs/pjproject/third_party/portaudio/include/portaudio.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/include/portaudio.h
rename to daemon/libs/pjproject/third_party/portaudio/include/portaudio.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/index.html b/daemon/libs/pjproject/third_party/portaudio/index.html
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/index.html
rename to daemon/libs/pjproject/third_party/portaudio/index.html
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/install-sh b/daemon/libs/pjproject/third_party/portaudio/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/install-sh
rename to daemon/libs/pjproject/third_party/portaudio/install-sh
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/ltmain.sh b/daemon/libs/pjproject/third_party/portaudio/ltmain.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/ltmain.sh
rename to daemon/libs/pjproject/third_party/portaudio/ltmain.sh
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/missing b/daemon/libs/pjproject/third_party/portaudio/missing
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/missing
rename to daemon/libs/pjproject/third_party/portaudio/missing
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/README.txt b/daemon/libs/pjproject/third_party/portaudio/pablio/README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/README.txt
rename to daemon/libs/pjproject/third_party/portaudio/pablio/README.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.c b/daemon/libs/pjproject/third_party/portaudio/pablio/pablio.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.c
rename to daemon/libs/pjproject/third_party/portaudio/pablio/pablio.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.def b/daemon/libs/pjproject/third_party/portaudio/pablio/pablio.def
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.def
rename to daemon/libs/pjproject/third_party/portaudio/pablio/pablio.def
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.h b/daemon/libs/pjproject/third_party/portaudio/pablio/pablio.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/pablio.h
rename to daemon/libs/pjproject/third_party/portaudio/pablio/pablio.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_rw.c b/daemon/libs/pjproject/third_party/portaudio/pablio/test_rw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_rw.c
rename to daemon/libs/pjproject/third_party/portaudio/pablio/test_rw.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_rw_echo.c b/daemon/libs/pjproject/third_party/portaudio/pablio/test_rw_echo.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_rw_echo.c
rename to daemon/libs/pjproject/third_party/portaudio/pablio/test_rw_echo.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_w_saw.c b/daemon/libs/pjproject/third_party/portaudio/pablio/test_w_saw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_w_saw.c
rename to daemon/libs/pjproject/third_party/portaudio/pablio/test_w_saw.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_w_saw8.c b/daemon/libs/pjproject/third_party/portaudio/pablio/test_w_saw8.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/pablio/test_w_saw8.c
rename to daemon/libs/pjproject/third_party/portaudio/pablio/test_w_saw8.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/portaudio-2.0.pc.in b/daemon/libs/pjproject/third_party/portaudio/portaudio-2.0.pc.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/portaudio-2.0.pc.in
rename to daemon/libs/pjproject/third_party/portaudio/portaudio-2.0.pc.in
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/SConscript b/daemon/libs/pjproject/third_party/portaudio/src/SConscript
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/SConscript
rename to daemon/libs/pjproject/third_party/portaudio/src/SConscript
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_allocation.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_allocation.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_allocation.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_allocation.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_allocation.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_allocation.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_allocation.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_allocation.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_converters.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_converters.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_converters.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_converters.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_converters.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_converters.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_cpuload.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_debugprint.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_dither.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_dither.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_dither.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_dither.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_dither.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_dither.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_dither.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_dither.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_endianness.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_endianness.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_endianness.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_endianness.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_front.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_front.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_front.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_front.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_hostapi.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_hostapi.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_hostapi.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_hostapi.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_memorybarrier.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_memorybarrier.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_memorybarrier.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_memorybarrier.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_process.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_process.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_process.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_process.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_process.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_process.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_process.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_process.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_ringbuffer.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_skeleton.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_skeleton.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_skeleton.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_skeleton.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_stream.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_stream.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_stream.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_stream.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_stream.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_stream.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_stream.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_stream.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_trace.c b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_trace.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_trace.c
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_trace.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_trace.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_trace.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_trace.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_trace.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_types.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_types.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_types.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_util.h b/daemon/libs/pjproject/third_party/portaudio/src/common/pa_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/common/pa_util.h
rename to daemon/libs/pjproject/third_party/portaudio/src/common/pa_util.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/ASIO-README.txt b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/ASIO-README.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/pa_asio.cpp b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/asio/pa_asio.cpp
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/notes.txt b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/notes.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/notes.txt
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/notes.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/jack/pa_jack.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/jack/pa_jack.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/jack/pa_jack.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/jack/pa_jack.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/recplay.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/recplay.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/oss/recplay.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/oss/recplay.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/readme.txt b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/readme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/readme.txt
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/wdmks/readme.txt
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c b/daemon/libs/pjproject/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
rename to daemon/libs/pjproject/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_hostapis.c b/daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_hostapis.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.c b/daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.h b/daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.h
rename to daemon/libs/pjproject/third_party/portaudio/src/os/unix/pa_unix_util.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_hostapis.c b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_hostapis.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_hostapis.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_hostapis.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_util.c b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_util.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_util.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_util.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_waveformat.c b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_waveformat.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_waveformat.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_waveformat.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.c b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.c
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.h b/daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
rename to daemon/libs/pjproject/third_party/portaudio/src/os/win/pa_x86_plain_converters.h
diff --git a/sflphone-common/libs/pjproject/third_party/portaudio/testcvs/changeme.txt b/daemon/libs/pjproject/third_party/portaudio/testcvs/changeme.txt
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/portaudio/testcvs/changeme.txt
rename to daemon/libs/pjproject/third_party/portaudio/testcvs/changeme.txt
diff --git a/sflphone-common/libs/pjproject/third_party/resample/COPYING b/daemon/libs/pjproject/third_party/resample/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/COPYING
rename to daemon/libs/pjproject/third_party/resample/COPYING
diff --git a/sflphone-common/libs/pjproject/third_party/resample/README.resample b/daemon/libs/pjproject/third_party/resample/README.resample
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/README.resample
rename to daemon/libs/pjproject/third_party/resample/README.resample
diff --git a/sflphone-common/libs/pjproject/third_party/resample/include/resamplesubs.h b/daemon/libs/pjproject/third_party/resample/include/resamplesubs.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/include/resamplesubs.h
rename to daemon/libs/pjproject/third_party/resample/include/resamplesubs.h
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/largefilter.h b/daemon/libs/pjproject/third_party/resample/src/largefilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/largefilter.h
rename to daemon/libs/pjproject/third_party/resample/src/largefilter.h
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/libresample_dll.c b/daemon/libs/pjproject/third_party/resample/src/libresample_dll.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/libresample_dll.c
rename to daemon/libs/pjproject/third_party/resample/src/libresample_dll.c
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/resample.h b/daemon/libs/pjproject/third_party/resample/src/resample.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/resample.h
rename to daemon/libs/pjproject/third_party/resample/src/resample.h
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/resamplesubs.c b/daemon/libs/pjproject/third_party/resample/src/resamplesubs.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/resamplesubs.c
rename to daemon/libs/pjproject/third_party/resample/src/resamplesubs.c
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/smallfilter.h b/daemon/libs/pjproject/third_party/resample/src/smallfilter.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/smallfilter.h
rename to daemon/libs/pjproject/third_party/resample/src/smallfilter.h
diff --git a/sflphone-common/libs/pjproject/third_party/resample/src/stddefs.h b/daemon/libs/pjproject/third_party/resample/src/stddefs.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/resample/src/stddefs.h
rename to daemon/libs/pjproject/third_party/resample/src/stddefs.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/AUTHORS b/daemon/libs/pjproject/third_party/speex/AUTHORS
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/AUTHORS
rename to daemon/libs/pjproject/third_party/speex/AUTHORS
diff --git a/sflphone-common/libs/pjproject/third_party/speex/COPYING b/daemon/libs/pjproject/third_party/speex/COPYING
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/COPYING
rename to daemon/libs/pjproject/third_party/speex/COPYING
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_bits.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_bits.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_bits.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_bits.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_buffer.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_buffer.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_buffer.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_buffer.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_callbacks.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_callbacks.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_callbacks.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_callbacks.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_config_types.h.in b/daemon/libs/pjproject/third_party/speex/include/speex/speex_config_types.h.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_config_types.h.in
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_config_types.h.in
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_echo.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_echo.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_echo.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_echo.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_header.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_header.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_header.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_header.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_jitter.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_jitter.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_jitter.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_jitter.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_preprocess.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_preprocess.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_preprocess.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_preprocess.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_resampler.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_resampler.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_resampler.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_resampler.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_stereo.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_stereo.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_stereo.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_stereo.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_types.h b/daemon/libs/pjproject/third_party/speex/include/speex/speex_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/include/speex/speex_types.h
rename to daemon/libs/pjproject/third_party/speex/include/speex/speex_types.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/_kiss_fft_guts.h b/daemon/libs/pjproject/third_party/speex/libspeex/_kiss_fft_guts.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/_kiss_fft_guts.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/_kiss_fft_guts.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/arch.h b/daemon/libs/pjproject/third_party/speex/libspeex/arch.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/arch.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/arch.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/bits.c b/daemon/libs/pjproject/third_party/speex/libspeex/bits.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/bits.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/bits.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/buffer.c b/daemon/libs/pjproject/third_party/speex/libspeex/buffer.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/buffer.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/buffer.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search.c b/daemon/libs/pjproject/third_party/speex/libspeex/cb_search.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/cb_search.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search.h b/daemon/libs/pjproject/third_party/speex/libspeex/cb_search.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/cb_search.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_arm4.h b/daemon/libs/pjproject/third_party/speex/libspeex/cb_search_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_arm4.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/cb_search_arm4.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/cb_search_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/cb_search_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_sse.h b/daemon/libs/pjproject/third_party/speex/libspeex/cb_search_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/cb_search_sse.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/cb_search_sse.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/echo_diagnostic.m b/daemon/libs/pjproject/third_party/speex/libspeex/echo_diagnostic.m
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/echo_diagnostic.m
rename to daemon/libs/pjproject/third_party/speex/libspeex/echo_diagnostic.m
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_10_16_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_10_16_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_10_16_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_10_16_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_10_32_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_10_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_10_32_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_10_32_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_20_32_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_20_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_20_32_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_20_32_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_5_256_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_5_256_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_5_256_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_5_256_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_5_64_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_5_64_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_5_64_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_5_64_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_8_128_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/exc_8_128_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/exc_8_128_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/exc_8_128_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fftwrap.c b/daemon/libs/pjproject/third_party/speex/libspeex/fftwrap.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fftwrap.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/fftwrap.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fftwrap.h b/daemon/libs/pjproject/third_party/speex/libspeex/fftwrap.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fftwrap.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fftwrap.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filterbank.c b/daemon/libs/pjproject/third_party/speex/libspeex/filterbank.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filterbank.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/filterbank.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filterbank.h b/daemon/libs/pjproject/third_party/speex/libspeex/filterbank.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filterbank.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/filterbank.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filters.c b/daemon/libs/pjproject/third_party/speex/libspeex/filters.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filters.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/filters.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filters.h b/daemon/libs/pjproject/third_party/speex/libspeex/filters.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filters.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/filters.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_arm4.h b/daemon/libs/pjproject/third_party/speex/libspeex/filters_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_arm4.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/filters_arm4.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/filters_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/filters_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_sse.h b/daemon/libs/pjproject/third_party/speex/libspeex/filters_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/filters_sse.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/filters_sse.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_arm4.h b/daemon/libs/pjproject/third_party/speex/libspeex/fixed_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_arm4.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fixed_arm4.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_arm5e.h b/daemon/libs/pjproject/third_party/speex/libspeex/fixed_arm5e.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_arm5e.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fixed_arm5e.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/fixed_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fixed_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_debug.h b/daemon/libs/pjproject/third_party/speex/libspeex/fixed_debug.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_debug.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fixed_debug.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_generic.h b/daemon/libs/pjproject/third_party/speex/libspeex/fixed_generic.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/fixed_generic.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/fixed_generic.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/gain_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/gain_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/gain_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/gain_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/gain_table_lbr.c b/daemon/libs/pjproject/third_party/speex/libspeex/gain_table_lbr.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/gain_table_lbr.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/gain_table_lbr.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/hexc_10_32_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/hexc_10_32_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/hexc_10_32_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/hexc_10_32_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/hexc_table.c b/daemon/libs/pjproject/third_party/speex/libspeex/hexc_table.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/hexc_table.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/hexc_table.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/high_lsp_tables.c b/daemon/libs/pjproject/third_party/speex/libspeex/high_lsp_tables.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/high_lsp_tables.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/high_lsp_tables.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/jitter.c b/daemon/libs/pjproject/third_party/speex/libspeex/jitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/jitter.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/jitter.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fft.c b/daemon/libs/pjproject/third_party/speex/libspeex/kiss_fft.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fft.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/kiss_fft.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fft.h b/daemon/libs/pjproject/third_party/speex/libspeex/kiss_fft.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fft.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/kiss_fft.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fftr.c b/daemon/libs/pjproject/third_party/speex/libspeex/kiss_fftr.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fftr.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/kiss_fftr.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fftr.h b/daemon/libs/pjproject/third_party/speex/libspeex/kiss_fftr.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/kiss_fftr.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/kiss_fftr.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc.c b/daemon/libs/pjproject/third_party/speex/libspeex/lpc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/lpc.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc.h b/daemon/libs/pjproject/third_party/speex/libspeex/lpc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/lpc.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/lpc_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lpc_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/lpc_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp.c b/daemon/libs/pjproject/third_party/speex/libspeex/lsp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/lsp.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp.h b/daemon/libs/pjproject/third_party/speex/libspeex/lsp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/lsp.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/lsp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/lsp_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp_tables_nb.c b/daemon/libs/pjproject/third_party/speex/libspeex/lsp_tables_nb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/lsp_tables_nb.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/lsp_tables_nb.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp.c b/daemon/libs/pjproject/third_party/speex/libspeex/ltp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/ltp.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp.h b/daemon/libs/pjproject/third_party/speex/libspeex/ltp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/ltp.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_arm4.h b/daemon/libs/pjproject/third_party/speex/libspeex/ltp_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_arm4.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/ltp_arm4.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/ltp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/ltp_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_sse.h b/daemon/libs/pjproject/third_party/speex/libspeex/ltp_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/ltp_sse.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/ltp_sse.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/math_approx.h b/daemon/libs/pjproject/third_party/speex/libspeex/math_approx.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/math_approx.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/math_approx.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/mdf.c b/daemon/libs/pjproject/third_party/speex/libspeex/mdf.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/mdf.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/mdf.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/misc_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/misc_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/misc_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/misc_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/modes.c b/daemon/libs/pjproject/third_party/speex/libspeex/modes.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/modes.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/modes.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/modes.h b/daemon/libs/pjproject/third_party/speex/libspeex/modes.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/modes.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/modes.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/modes_wb.c b/daemon/libs/pjproject/third_party/speex/libspeex/modes_wb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/modes_wb.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/modes_wb.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/nb_celp.c b/daemon/libs/pjproject/third_party/speex/libspeex/nb_celp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/nb_celp.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/nb_celp.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/nb_celp.h b/daemon/libs/pjproject/third_party/speex/libspeex/nb_celp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/nb_celp.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/nb_celp.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/os_support.h b/daemon/libs/pjproject/third_party/speex/libspeex/os_support.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/os_support.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/os_support.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/preprocess.c b/daemon/libs/pjproject/third_party/speex/libspeex/preprocess.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/preprocess.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/preprocess.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/pseudofloat.h b/daemon/libs/pjproject/third_party/speex/libspeex/pseudofloat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/pseudofloat.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/pseudofloat.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp.c b/daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp.h b/daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/quant_lsp_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/quant_lsp_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/resample.c b/daemon/libs/pjproject/third_party/speex/libspeex/resample.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/resample.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/resample.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/resample_sse.h b/daemon/libs/pjproject/third_party/speex/libspeex/resample_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/resample_sse.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/resample_sse.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/sb_celp.c b/daemon/libs/pjproject/third_party/speex/libspeex/sb_celp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/sb_celp.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/sb_celp.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/sb_celp.h b/daemon/libs/pjproject/third_party/speex/libspeex/sb_celp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/sb_celp.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/sb_celp.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/scal.c b/daemon/libs/pjproject/third_party/speex/libspeex/scal.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/scal.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/scal.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/smallft.c b/daemon/libs/pjproject/third_party/speex/libspeex/smallft.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/smallft.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/smallft.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/smallft.h b/daemon/libs/pjproject/third_party/speex/libspeex/smallft.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/smallft.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/smallft.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/speex.c b/daemon/libs/pjproject/third_party/speex/libspeex/speex.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/speex.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/speex.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/speex_callbacks.c b/daemon/libs/pjproject/third_party/speex/libspeex/speex_callbacks.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/speex_callbacks.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/speex_callbacks.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/speex_header.c b/daemon/libs/pjproject/third_party/speex/libspeex/speex_header.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/speex_header.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/speex_header.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/stack_alloc.h b/daemon/libs/pjproject/third_party/speex/libspeex/stack_alloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/stack_alloc.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/stack_alloc.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/stereo.c b/daemon/libs/pjproject/third_party/speex/libspeex/stereo.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/stereo.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/stereo.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testdenoise.c b/daemon/libs/pjproject/third_party/speex/libspeex/testdenoise.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testdenoise.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testdenoise.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testecho.c b/daemon/libs/pjproject/third_party/speex/libspeex/testecho.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testecho.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testecho.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc.c b/daemon/libs/pjproject/third_party/speex/libspeex/testenc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testenc.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc_uwb.c b/daemon/libs/pjproject/third_party/speex/libspeex/testenc_uwb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc_uwb.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testenc_uwb.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc_wb.c b/daemon/libs/pjproject/third_party/speex/libspeex/testenc_wb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testenc_wb.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testenc_wb.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testjitter.c b/daemon/libs/pjproject/third_party/speex/libspeex/testjitter.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testjitter.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testjitter.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/testresample.c b/daemon/libs/pjproject/third_party/speex/libspeex/testresample.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/testresample.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/testresample.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vbr.c b/daemon/libs/pjproject/third_party/speex/libspeex/vbr.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vbr.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/vbr.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vbr.h b/daemon/libs/pjproject/third_party/speex/libspeex/vbr.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vbr.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vbr.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vorbis_psy.c b/daemon/libs/pjproject/third_party/speex/libspeex/vorbis_psy.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vorbis_psy.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/vorbis_psy.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vorbis_psy.h b/daemon/libs/pjproject/third_party/speex/libspeex/vorbis_psy.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vorbis_psy.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vorbis_psy.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vq.c b/daemon/libs/pjproject/third_party/speex/libspeex/vq.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vq.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/vq.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vq.h b/daemon/libs/pjproject/third_party/speex/libspeex/vq.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vq.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vq.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_arm4.h b/daemon/libs/pjproject/third_party/speex/libspeex/vq_arm4.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_arm4.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vq_arm4.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_bfin.h b/daemon/libs/pjproject/third_party/speex/libspeex/vq_bfin.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_bfin.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vq_bfin.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_sse.h b/daemon/libs/pjproject/third_party/speex/libspeex/vq_sse.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/vq_sse.h
rename to daemon/libs/pjproject/third_party/speex/libspeex/vq_sse.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/libspeex/window.c b/daemon/libs/pjproject/third_party/speex/libspeex/window.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/libspeex/window.c
rename to daemon/libs/pjproject/third_party/speex/libspeex/window.c
diff --git a/sflphone-common/libs/pjproject/third_party/speex/symbian/config.h b/daemon/libs/pjproject/third_party/speex/symbian/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/symbian/config.h
rename to daemon/libs/pjproject/third_party/speex/symbian/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/speex/win32/config.h b/daemon/libs/pjproject/third_party/speex/win32/config.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/speex/win32/config.h
rename to daemon/libs/pjproject/third_party/speex/win32/config.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/CHANGES b/daemon/libs/pjproject/third_party/srtp/CHANGES
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/CHANGES
rename to daemon/libs/pjproject/third_party/srtp/CHANGES
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/LICENSE b/daemon/libs/pjproject/third_party/srtp/LICENSE
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/LICENSE
rename to daemon/libs/pjproject/third_party/srtp/LICENSE
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/README b/daemon/libs/pjproject/third_party/srtp/README
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/README
rename to daemon/libs/pjproject/third_party/srtp/README
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/TODO b/daemon/libs/pjproject/third_party/srtp/TODO
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/TODO
rename to daemon/libs/pjproject/third_party/srtp/TODO
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/VERSION b/daemon/libs/pjproject/third_party/srtp/VERSION
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/VERSION
rename to daemon/libs/pjproject/third_party/srtp/VERSION
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/config.guess b/daemon/libs/pjproject/third_party/srtp/config.guess
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/config.guess
rename to daemon/libs/pjproject/third_party/srtp/config.guess
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/config.h_win32vc7 b/daemon/libs/pjproject/third_party/srtp/config.h_win32vc7
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/config.h_win32vc7
rename to daemon/libs/pjproject/third_party/srtp/config.h_win32vc7
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/config.hw b/daemon/libs/pjproject/third_party/srtp/config.hw
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/config.hw
rename to daemon/libs/pjproject/third_party/srtp/config.hw
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/config.sub b/daemon/libs/pjproject/third_party/srtp/config.sub
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/config.sub
rename to daemon/libs/pjproject/third_party/srtp/config.sub
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/config_in.h b/daemon/libs/pjproject/third_party/srtp/config_in.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/config_in.h
rename to daemon/libs/pjproject/third_party/srtp/config_in.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/configure b/daemon/libs/pjproject/third_party/srtp/configure
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/configure
rename to daemon/libs/pjproject/third_party/srtp/configure
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/configure.in b/daemon/libs/pjproject/third_party/srtp/configure.in
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/configure.in
rename to daemon/libs/pjproject/third_party/srtp/configure.in
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/Makefile b/daemon/libs/pjproject/third_party/srtp/crypto/Makefile
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/Makefile
rename to daemon/libs/pjproject/third_party/srtp/crypto/Makefile
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/VERSION b/daemon/libs/pjproject/third_party/srtp/crypto/VERSION
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/VERSION
rename to daemon/libs/pjproject/third_party/srtp/crypto/VERSION
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/ae_xfm/xfm.c b/daemon/libs/pjproject/third_party/srtp/crypto/ae_xfm/xfm.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/ae_xfm/xfm.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/ae_xfm/xfm.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes.c b/daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes_cbc.c b/daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes_cbc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes_cbc.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes_cbc.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes_icm.c b/daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes_icm.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/aes_icm.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/cipher/aes_icm.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/cipher.c b/daemon/libs/pjproject/third_party/srtp/crypto/cipher/cipher.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/cipher.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/cipher/cipher.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/null_cipher.c b/daemon/libs/pjproject/third_party/srtp/crypto/cipher/null_cipher.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/cipher/null_cipher.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/cipher/null_cipher.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/auth.c b/daemon/libs/pjproject/third_party/srtp/crypto/hash/auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/auth.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/hash/auth.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/hmac.c b/daemon/libs/pjproject/third_party/srtp/crypto/hash/hmac.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/hmac.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/hash/hmac.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/null_auth.c b/daemon/libs/pjproject/third_party/srtp/crypto/hash/null_auth.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/null_auth.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/hash/null_auth.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/sha1.c b/daemon/libs/pjproject/third_party/srtp/crypto/hash/sha1.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/hash/sha1.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/hash/sha1.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/aes.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/aes.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes_cbc.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/aes_cbc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes_cbc.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/aes_cbc.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes_icm.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/aes_icm.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/aes_icm.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/aes_icm.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/alloc.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/alloc.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/alloc.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/alloc.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/auth.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/auth.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/auth.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/cipher.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/cipher.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/cipher.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/cipher.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/crypto.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/crypto.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_kernel.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_kernel.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_kernel.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_kernel.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_math.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_math.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_math.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_math.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_types.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_types.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/crypto_types.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/crypto_types.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/cryptoalg.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/cryptoalg.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/cryptoalg.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/cryptoalg.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/datatypes.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/datatypes.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/datatypes.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/datatypes.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/err.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/err.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/err.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/err.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/gf2_8.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/gf2_8.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/gf2_8.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/gf2_8.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/hmac.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/hmac.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/hmac.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/hmac.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/integers.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/integers.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/integers.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/integers.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/kernel_compat.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/kernel_compat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/kernel_compat.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/kernel_compat.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/key.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/key.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/key.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/key.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/null_auth.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/null_auth.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/null_auth.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/null_auth.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/null_cipher.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/null_cipher.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/null_cipher.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/null_cipher.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/prng.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/prng.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/prng.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/prng.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rand_source.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/rand_source.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rand_source.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/rand_source.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rdb.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/rdb.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rdb.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/rdb.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rdbx.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/rdbx.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/rdbx.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/rdbx.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/sha1.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/sha1.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/sha1.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/sha1.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/stat.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/stat.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/stat.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/stat.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/include/xfm.h b/daemon/libs/pjproject/third_party/srtp/crypto/include/xfm.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/include/xfm.h
rename to daemon/libs/pjproject/third_party/srtp/crypto/include/xfm.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/alloc.c b/daemon/libs/pjproject/third_party/srtp/crypto/kernel/alloc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/alloc.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/kernel/alloc.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/crypto_kernel.c b/daemon/libs/pjproject/third_party/srtp/crypto/kernel/crypto_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/crypto_kernel.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/kernel/crypto_kernel.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/err.c b/daemon/libs/pjproject/third_party/srtp/crypto/kernel/err.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/err.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/kernel/err.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/key.c b/daemon/libs/pjproject/third_party/srtp/crypto/kernel/key.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/kernel/key.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/kernel/key.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/math/datatypes.c b/daemon/libs/pjproject/third_party/srtp/crypto/math/datatypes.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/math/datatypes.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/math/datatypes.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/math/gf2_8.c b/daemon/libs/pjproject/third_party/srtp/crypto/math/gf2_8.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/math/gf2_8.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/math/gf2_8.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/math/math.c b/daemon/libs/pjproject/third_party/srtp/crypto/math/math.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/math/math.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/math/math.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/math/stat.c b/daemon/libs/pjproject/third_party/srtp/crypto/math/stat.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/math/stat.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/math/stat.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/rdb.c b/daemon/libs/pjproject/third_party/srtp/crypto/replay/rdb.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/rdb.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/replay/rdb.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/rdbx.c b/daemon/libs/pjproject/third_party/srtp/crypto/replay/rdbx.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/rdbx.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/replay/rdbx.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/ut_sim.c b/daemon/libs/pjproject/third_party/srtp/crypto/replay/ut_sim.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/replay/ut_sim.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/replay/ut_sim.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/ctr_prng.c b/daemon/libs/pjproject/third_party/srtp/crypto/rng/ctr_prng.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/ctr_prng.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/rng/ctr_prng.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/prng.c b/daemon/libs/pjproject/third_party/srtp/crypto/rng/prng.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/prng.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/rng/prng.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/rand_linux_kernel.c b/daemon/libs/pjproject/third_party/srtp/crypto/rng/rand_linux_kernel.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/rand_linux_kernel.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/rng/rand_linux_kernel.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/rand_source.c b/daemon/libs/pjproject/third_party/srtp/crypto/rng/rand_source.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/rng/rand_source.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/rng/rand_source.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/aes_calc.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/aes_calc.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/aes_calc.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/aes_calc.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/auth_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/auth_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/auth_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/auth_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/cipher_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/cipher_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/cipher_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/cipher_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/datatypes_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/datatypes_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/datatypes_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/datatypes_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/env.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/env.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/env.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/env.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/kernel_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/kernel_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/kernel_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/kernel_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/rand_gen.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/rand_gen.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/rand_gen.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/rand_gen.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/sha1_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/sha1_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/sha1_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/sha1_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/crypto/test/stat_driver.c b/daemon/libs/pjproject/third_party/srtp/crypto/test/stat_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/crypto/test/stat_driver.c
rename to daemon/libs/pjproject/third_party/srtp/crypto/test/stat_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/getopt_s.h b/daemon/libs/pjproject/third_party/srtp/include/getopt_s.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/getopt_s.h
rename to daemon/libs/pjproject/third_party/srtp/include/getopt_s.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/rtp.h b/daemon/libs/pjproject/third_party/srtp/include/rtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/rtp.h
rename to daemon/libs/pjproject/third_party/srtp/include/rtp.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/rtp_priv.h b/daemon/libs/pjproject/third_party/srtp/include/rtp_priv.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/rtp_priv.h
rename to daemon/libs/pjproject/third_party/srtp/include/rtp_priv.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/srtp.h b/daemon/libs/pjproject/third_party/srtp/include/srtp.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/srtp.h
rename to daemon/libs/pjproject/third_party/srtp/include/srtp.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/srtp_priv.h b/daemon/libs/pjproject/third_party/srtp/include/srtp_priv.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/srtp_priv.h
rename to daemon/libs/pjproject/third_party/srtp/include/srtp_priv.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/include/ut_sim.h b/daemon/libs/pjproject/third_party/srtp/include/ut_sim.h
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/include/ut_sim.h
rename to daemon/libs/pjproject/third_party/srtp/include/ut_sim.h
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/install-sh b/daemon/libs/pjproject/third_party/srtp/install-sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/install-sh
rename to daemon/libs/pjproject/third_party/srtp/install-sh
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/pjlib/srtp_err.c b/daemon/libs/pjproject/third_party/srtp/pjlib/srtp_err.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/pjlib/srtp_err.c
rename to daemon/libs/pjproject/third_party/srtp/pjlib/srtp_err.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/srtp.def b/daemon/libs/pjproject/third_party/srtp/srtp.def
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/srtp.def
rename to daemon/libs/pjproject/third_party/srtp/srtp.def
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/srtp.vcproj b/daemon/libs/pjproject/third_party/srtp/srtp.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/srtp.vcproj
rename to daemon/libs/pjproject/third_party/srtp/srtp.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/srtp/srtp.c b/daemon/libs/pjproject/third_party/srtp/srtp/srtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/srtp/srtp.c
rename to daemon/libs/pjproject/third_party/srtp/srtp/srtp.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/srtp7.sln b/daemon/libs/pjproject/third_party/srtp/srtp7.sln
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/srtp7.sln
rename to daemon/libs/pjproject/third_party/srtp/srtp7.sln
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/srtp7.vcproj b/daemon/libs/pjproject/third_party/srtp/srtp7.vcproj
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/srtp7.vcproj
rename to daemon/libs/pjproject/third_party/srtp/srtp7.vcproj
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/tables/aes_tables.c b/daemon/libs/pjproject/third_party/srtp/tables/aes_tables.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/tables/aes_tables.c
rename to daemon/libs/pjproject/third_party/srtp/tables/aes_tables.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/dtls_srtp_driver.c b/daemon/libs/pjproject/third_party/srtp/test/dtls_srtp_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/dtls_srtp_driver.c
rename to daemon/libs/pjproject/third_party/srtp/test/dtls_srtp_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/getopt_s.c b/daemon/libs/pjproject/third_party/srtp/test/getopt_s.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/getopt_s.c
rename to daemon/libs/pjproject/third_party/srtp/test/getopt_s.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/lfsr.c b/daemon/libs/pjproject/third_party/srtp/test/lfsr.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/lfsr.c
rename to daemon/libs/pjproject/third_party/srtp/test/lfsr.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/rdbx_driver.c b/daemon/libs/pjproject/third_party/srtp/test/rdbx_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/rdbx_driver.c
rename to daemon/libs/pjproject/third_party/srtp/test/rdbx_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/replay_driver.c b/daemon/libs/pjproject/third_party/srtp/test/replay_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/replay_driver.c
rename to daemon/libs/pjproject/third_party/srtp/test/replay_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/roc_driver.c b/daemon/libs/pjproject/third_party/srtp/test/roc_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/roc_driver.c
rename to daemon/libs/pjproject/third_party/srtp/test/roc_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/rtp.c b/daemon/libs/pjproject/third_party/srtp/test/rtp.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/rtp.c
rename to daemon/libs/pjproject/third_party/srtp/test/rtp.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/rtpw.c b/daemon/libs/pjproject/third_party/srtp/test/rtpw.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/rtpw.c
rename to daemon/libs/pjproject/third_party/srtp/test/rtpw.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/rtpw_test.sh b/daemon/libs/pjproject/third_party/srtp/test/rtpw_test.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/rtpw_test.sh
rename to daemon/libs/pjproject/third_party/srtp/test/rtpw_test.sh
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/test/srtp_driver.c b/daemon/libs/pjproject/third_party/srtp/test/srtp_driver.c
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/test/srtp_driver.c
rename to daemon/libs/pjproject/third_party/srtp/test/srtp_driver.c
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/timing b/daemon/libs/pjproject/third_party/srtp/timing
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/timing
rename to daemon/libs/pjproject/third_party/srtp/timing
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/undos.sh b/daemon/libs/pjproject/third_party/srtp/undos.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/undos.sh
rename to daemon/libs/pjproject/third_party/srtp/undos.sh
diff --git a/sflphone-common/libs/pjproject/third_party/srtp/update.sh b/daemon/libs/pjproject/third_party/srtp/update.sh
similarity index 100%
rename from sflphone-common/libs/pjproject/third_party/srtp/update.sh
rename to daemon/libs/pjproject/third_party/srtp/update.sh
diff --git a/sflphone-common/libs/pjproject/user.mak.sample b/daemon/libs/pjproject/user.mak.sample
similarity index 100%
rename from sflphone-common/libs/pjproject/user.mak.sample
rename to daemon/libs/pjproject/user.mak.sample
diff --git a/sflphone-common/libs/utilspp/Makefile.am b/daemon/libs/utilspp/Makefile.am
similarity index 100%
rename from sflphone-common/libs/utilspp/Makefile.am
rename to daemon/libs/utilspp/Makefile.am
diff --git a/sflphone-common/libs/utilspp/NullType.hpp b/daemon/libs/utilspp/NullType.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/NullType.hpp
rename to daemon/libs/utilspp/NullType.hpp
diff --git a/sflphone-common/libs/utilspp/Singleton.hpp b/daemon/libs/utilspp/Singleton.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/Singleton.hpp
rename to daemon/libs/utilspp/Singleton.hpp
diff --git a/sflphone-common/libs/utilspp/ThreadingSingle.hpp b/daemon/libs/utilspp/ThreadingSingle.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/ThreadingSingle.hpp
rename to daemon/libs/utilspp/ThreadingSingle.hpp
diff --git a/sflphone-common/libs/utilspp/ThreadingSingle.inl b/daemon/libs/utilspp/ThreadingSingle.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/ThreadingSingle.inl
rename to daemon/libs/utilspp/ThreadingSingle.inl
diff --git a/sflphone-common/libs/utilspp/singleton/CreationStatic.hpp b/daemon/libs/utilspp/singleton/CreationStatic.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/CreationStatic.hpp
rename to daemon/libs/utilspp/singleton/CreationStatic.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/CreationStatic.inl b/daemon/libs/utilspp/singleton/CreationStatic.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/CreationStatic.inl
rename to daemon/libs/utilspp/singleton/CreationStatic.inl
diff --git a/sflphone-common/libs/utilspp/singleton/CreationUsingNew.hpp b/daemon/libs/utilspp/singleton/CreationUsingNew.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/CreationUsingNew.hpp
rename to daemon/libs/utilspp/singleton/CreationUsingNew.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/CreationUsingNew.inl b/daemon/libs/utilspp/singleton/CreationUsingNew.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/CreationUsingNew.inl
rename to daemon/libs/utilspp/singleton/CreationUsingNew.inl
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeDefault.hpp b/daemon/libs/utilspp/singleton/LifetimeDefault.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeDefault.hpp
rename to daemon/libs/utilspp/singleton/LifetimeDefault.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeDefault.inl b/daemon/libs/utilspp/singleton/LifetimeDefault.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeDefault.inl
rename to daemon/libs/utilspp/singleton/LifetimeDefault.inl
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp b/daemon/libs/utilspp/singleton/LifetimeLibrary.cpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeLibrary.cpp
rename to daemon/libs/utilspp/singleton/LifetimeLibrary.cpp
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.hpp b/daemon/libs/utilspp/singleton/LifetimeLibrary.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeLibrary.hpp
rename to daemon/libs/utilspp/singleton/LifetimeLibrary.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeLibrary.inl b/daemon/libs/utilspp/singleton/LifetimeLibrary.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeLibrary.inl
rename to daemon/libs/utilspp/singleton/LifetimeLibrary.inl
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeWithLongevity.hpp b/daemon/libs/utilspp/singleton/LifetimeWithLongevity.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeWithLongevity.hpp
rename to daemon/libs/utilspp/singleton/LifetimeWithLongevity.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/LifetimeWithLongevity.inl b/daemon/libs/utilspp/singleton/LifetimeWithLongevity.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/LifetimeWithLongevity.inl
rename to daemon/libs/utilspp/singleton/LifetimeWithLongevity.inl
diff --git a/sflphone-common/libs/utilspp/singleton/Makefile.am b/daemon/libs/utilspp/singleton/Makefile.am
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/Makefile.am
rename to daemon/libs/utilspp/singleton/Makefile.am
diff --git a/sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp b/daemon/libs/utilspp/singleton/PrivateMembers.cpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/PrivateMembers.cpp
rename to daemon/libs/utilspp/singleton/PrivateMembers.cpp
diff --git a/sflphone-common/libs/utilspp/singleton/PrivateMembers.hpp b/daemon/libs/utilspp/singleton/PrivateMembers.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/PrivateMembers.hpp
rename to daemon/libs/utilspp/singleton/PrivateMembers.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/PrivateMembers.inl b/daemon/libs/utilspp/singleton/PrivateMembers.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/PrivateMembers.inl
rename to daemon/libs/utilspp/singleton/PrivateMembers.inl
diff --git a/sflphone-common/libs/utilspp/singleton/SingletonHolder.hpp b/daemon/libs/utilspp/singleton/SingletonHolder.hpp
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/SingletonHolder.hpp
rename to daemon/libs/utilspp/singleton/SingletonHolder.hpp
diff --git a/sflphone-common/libs/utilspp/singleton/SingletonHolder.inl b/daemon/libs/utilspp/singleton/SingletonHolder.inl
similarity index 100%
rename from sflphone-common/libs/utilspp/singleton/SingletonHolder.inl
rename to daemon/libs/utilspp/singleton/SingletonHolder.inl
diff --git a/sflphone-common/man/Makefile.am b/daemon/man/Makefile.am
similarity index 100%
rename from sflphone-common/man/Makefile.am
rename to daemon/man/Makefile.am
diff --git a/sflphone-client-gnome/man/README.manpages b/daemon/man/README.manpages
similarity index 100%
rename from sflphone-client-gnome/man/README.manpages
rename to daemon/man/README.manpages
diff --git a/sflphone-common/man/sflphoned.pod b/daemon/man/sflphoned.pod
similarity index 100%
rename from sflphone-common/man/sflphoned.pod
rename to daemon/man/sflphoned.pod
diff --git a/sflphone-common/ringtones/Makefile.am b/daemon/ringtones/Makefile.am
similarity index 100%
rename from sflphone-common/ringtones/Makefile.am
rename to daemon/ringtones/Makefile.am
diff --git a/sflphone-common/ringtones/konga.ul b/daemon/ringtones/konga.ul
similarity index 100%
rename from sflphone-common/ringtones/konga.ul
rename to daemon/ringtones/konga.ul
diff --git a/sflphone-common/ringtones/phone.au b/daemon/ringtones/phone.au
similarity index 100%
rename from sflphone-common/ringtones/phone.au
rename to daemon/ringtones/phone.au
diff --git a/sflphone-common/ringtones/phone2.au b/daemon/ringtones/phone2.au
similarity index 100%
rename from sflphone-common/ringtones/phone2.au
rename to daemon/ringtones/phone2.au
diff --git a/sflphone-common/src/Codec.h b/daemon/src/Codec.h
similarity index 100%
rename from sflphone-common/src/Codec.h
rename to daemon/src/Codec.h
diff --git a/sflphone-common/src/Makefile.am b/daemon/src/Makefile.am
similarity index 100%
rename from sflphone-common/src/Makefile.am
rename to daemon/src/Makefile.am
diff --git a/sflphone-common/src/account.cpp b/daemon/src/account.cpp
similarity index 100%
rename from sflphone-common/src/account.cpp
rename to daemon/src/account.cpp
diff --git a/sflphone-common/src/account.h b/daemon/src/account.h
similarity index 100%
rename from sflphone-common/src/account.h
rename to daemon/src/account.h
diff --git a/sflphone-common/src/accountcreator.cpp b/daemon/src/accountcreator.cpp
similarity index 100%
rename from sflphone-common/src/accountcreator.cpp
rename to daemon/src/accountcreator.cpp
diff --git a/sflphone-common/src/accountcreator.h b/daemon/src/accountcreator.h
similarity index 100%
rename from sflphone-common/src/accountcreator.h
rename to daemon/src/accountcreator.h
diff --git a/sflphone-common/src/audio/Makefile.am b/daemon/src/audio/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/Makefile.am
rename to daemon/src/audio/Makefile.am
diff --git a/sflphone-common/src/audio/algorithm.h b/daemon/src/audio/algorithm.h
similarity index 100%
rename from sflphone-common/src/audio/algorithm.h
rename to daemon/src/audio/algorithm.h
diff --git a/sflphone-common/src/audio/alsa/Makefile.am b/daemon/src/audio/alsa/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/alsa/Makefile.am
rename to daemon/src/audio/alsa/Makefile.am
diff --git a/sflphone-common/src/audio/alsa/alsalayer.cpp b/daemon/src/audio/alsa/alsalayer.cpp
similarity index 100%
rename from sflphone-common/src/audio/alsa/alsalayer.cpp
rename to daemon/src/audio/alsa/alsalayer.cpp
diff --git a/sflphone-common/src/audio/alsa/alsalayer.h b/daemon/src/audio/alsa/alsalayer.h
similarity index 100%
rename from sflphone-common/src/audio/alsa/alsalayer.h
rename to daemon/src/audio/alsa/alsalayer.h
diff --git a/sflphone-common/src/audio/audiodevice.cpp b/daemon/src/audio/audiodevice.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiodevice.cpp
rename to daemon/src/audio/audiodevice.cpp
diff --git a/sflphone-common/src/audio/audiodevice.h b/daemon/src/audio/audiodevice.h
similarity index 100%
rename from sflphone-common/src/audio/audiodevice.h
rename to daemon/src/audio/audiodevice.h
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/daemon/src/audio/audiolayer.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiolayer.cpp
rename to daemon/src/audio/audiolayer.cpp
diff --git a/sflphone-common/src/audio/audiolayer.h b/daemon/src/audio/audiolayer.h
similarity index 100%
rename from sflphone-common/src/audio/audiolayer.h
rename to daemon/src/audio/audiolayer.h
diff --git a/sflphone-common/src/audio/audioloop.cpp b/daemon/src/audio/audioloop.cpp
similarity index 100%
rename from sflphone-common/src/audio/audioloop.cpp
rename to daemon/src/audio/audioloop.cpp
diff --git a/sflphone-common/src/audio/audioloop.h b/daemon/src/audio/audioloop.h
similarity index 100%
rename from sflphone-common/src/audio/audioloop.h
rename to daemon/src/audio/audioloop.h
diff --git a/sflphone-common/src/audio/audioprocessing.cpp b/daemon/src/audio/audioprocessing.cpp
similarity index 100%
rename from sflphone-common/src/audio/audioprocessing.cpp
rename to daemon/src/audio/audioprocessing.cpp
diff --git a/sflphone-common/src/audio/audioprocessing.h b/daemon/src/audio/audioprocessing.h
similarity index 100%
rename from sflphone-common/src/audio/audioprocessing.h
rename to daemon/src/audio/audioprocessing.h
diff --git a/sflphone-common/src/audio/audiorecord.cpp b/daemon/src/audio/audiorecord.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiorecord.cpp
rename to daemon/src/audio/audiorecord.cpp
diff --git a/sflphone-common/src/audio/audiorecord.h b/daemon/src/audio/audiorecord.h
similarity index 100%
rename from sflphone-common/src/audio/audiorecord.h
rename to daemon/src/audio/audiorecord.h
diff --git a/sflphone-common/src/audio/audiorecorder.cpp b/daemon/src/audio/audiorecorder.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiorecorder.cpp
rename to daemon/src/audio/audiorecorder.cpp
diff --git a/sflphone-common/src/audio/audiorecorder.h b/daemon/src/audio/audiorecorder.h
similarity index 100%
rename from sflphone-common/src/audio/audiorecorder.h
rename to daemon/src/audio/audiorecorder.h
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp b/daemon/src/audio/audiortp/AudioRtpFactory.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
rename to daemon/src/audio/audiortp/AudioRtpFactory.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h b/daemon/src/audio/audiortp/AudioRtpFactory.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpFactory.h
rename to daemon/src/audio/audiortp/AudioRtpFactory.h
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp b/daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
rename to daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h b/daemon/src/audio/audiortp/AudioRtpRecordHandler.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.h
rename to daemon/src/audio/audiortp/AudioRtpRecordHandler.h
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp b/daemon/src/audio/audiortp/AudioRtpSession.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
rename to daemon/src/audio/audiortp/AudioRtpSession.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/daemon/src/audio/audiortp/AudioRtpSession.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioRtpSession.h
rename to daemon/src/audio/audiortp/AudioRtpSession.h
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/daemon/src/audio/audiortp/AudioSrtpSession.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
rename to daemon/src/audio/audiortp/AudioSrtpSession.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.h b/daemon/src/audio/audiortp/AudioSrtpSession.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioSrtpSession.h
rename to daemon/src/audio/audiortp/AudioSrtpSession.h
diff --git a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp b/daemon/src/audio/audiortp/AudioSymmetricRtpSession.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp
rename to daemon/src/audio/audiortp/AudioSymmetricRtpSession.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h b/daemon/src/audio/audiortp/AudioSymmetricRtpSession.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.h
rename to daemon/src/audio/audiortp/AudioSymmetricRtpSession.h
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/daemon/src/audio/audiortp/AudioZrtpSession.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
rename to daemon/src/audio/audiortp/AudioZrtpSession.cpp
diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.h b/daemon/src/audio/audiortp/AudioZrtpSession.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/AudioZrtpSession.h
rename to daemon/src/audio/audiortp/AudioZrtpSession.h
diff --git a/sflphone-common/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/audiortp/Makefile.am
rename to daemon/src/audio/audiortp/Makefile.am
diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp b/daemon/src/audio/audiortp/ZrtpSessionCallback.cpp
similarity index 100%
rename from sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp
rename to daemon/src/audio/audiortp/ZrtpSessionCallback.cpp
diff --git a/sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h b/daemon/src/audio/audiortp/ZrtpSessionCallback.h
similarity index 100%
rename from sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h
rename to daemon/src/audio/audiortp/ZrtpSessionCallback.h
diff --git a/sflphone-common/src/audio/codecs/Makefile.am b/daemon/src/audio/codecs/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/codecs/Makefile.am
rename to daemon/src/audio/codecs/Makefile.am
diff --git a/sflphone-common/src/audio/codecs/README b/daemon/src/audio/codecs/README
similarity index 100%
rename from sflphone-common/src/audio/codecs/README
rename to daemon/src/audio/codecs/README
diff --git a/sflphone-common/src/audio/codecs/alaw.cpp b/daemon/src/audio/codecs/alaw.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/alaw.cpp
rename to daemon/src/audio/codecs/alaw.cpp
diff --git a/sflphone-common/src/audio/codecs/audiocodec.cpp b/daemon/src/audio/codecs/audiocodec.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/audiocodec.cpp
rename to daemon/src/audio/codecs/audiocodec.cpp
diff --git a/sflphone-common/src/audio/codecs/audiocodec.h b/daemon/src/audio/codecs/audiocodec.h
similarity index 100%
rename from sflphone-common/src/audio/codecs/audiocodec.h
rename to daemon/src/audio/codecs/audiocodec.h
diff --git a/sflphone-common/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/audiocodecfactory.cpp
rename to daemon/src/audio/codecs/audiocodecfactory.cpp
diff --git a/sflphone-common/src/audio/codecs/audiocodecfactory.h b/daemon/src/audio/codecs/audiocodecfactory.h
similarity index 100%
rename from sflphone-common/src/audio/codecs/audiocodecfactory.h
rename to daemon/src/audio/codecs/audiocodecfactory.h
diff --git a/sflphone-common/src/audio/codecs/celtcodec.cpp b/daemon/src/audio/codecs/celtcodec.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/celtcodec.cpp
rename to daemon/src/audio/codecs/celtcodec.cpp
diff --git a/sflphone-common/src/audio/codecs/g722.cpp b/daemon/src/audio/codecs/g722.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/g722.cpp
rename to daemon/src/audio/codecs/g722.cpp
diff --git a/sflphone-common/src/audio/codecs/g722.h b/daemon/src/audio/codecs/g722.h
similarity index 100%
rename from sflphone-common/src/audio/codecs/g722.h
rename to daemon/src/audio/codecs/g722.h
diff --git a/sflphone-common/src/audio/codecs/gsmcodec.cpp b/daemon/src/audio/codecs/gsmcodec.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/gsmcodec.cpp
rename to daemon/src/audio/codecs/gsmcodec.cpp
diff --git a/sflphone-common/src/audio/codecs/speexcodec.h b/daemon/src/audio/codecs/speexcodec.h
similarity index 100%
rename from sflphone-common/src/audio/codecs/speexcodec.h
rename to daemon/src/audio/codecs/speexcodec.h
diff --git a/sflphone-common/src/audio/codecs/speexcodec_nb.cpp b/daemon/src/audio/codecs/speexcodec_nb.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/speexcodec_nb.cpp
rename to daemon/src/audio/codecs/speexcodec_nb.cpp
diff --git a/sflphone-common/src/audio/codecs/speexcodec_ub.cpp b/daemon/src/audio/codecs/speexcodec_ub.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/speexcodec_ub.cpp
rename to daemon/src/audio/codecs/speexcodec_ub.cpp
diff --git a/sflphone-common/src/audio/codecs/speexcodec_wb.cpp b/daemon/src/audio/codecs/speexcodec_wb.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/speexcodec_wb.cpp
rename to daemon/src/audio/codecs/speexcodec_wb.cpp
diff --git a/sflphone-common/src/audio/codecs/ulaw.cpp b/daemon/src/audio/codecs/ulaw.cpp
similarity index 100%
rename from sflphone-common/src/audio/codecs/ulaw.cpp
rename to daemon/src/audio/codecs/ulaw.cpp
diff --git a/sflphone-common/src/audio/common.h b/daemon/src/audio/common.h
similarity index 100%
rename from sflphone-common/src/audio/common.h
rename to daemon/src/audio/common.h
diff --git a/sflphone-common/src/audio/dcblocker.cpp b/daemon/src/audio/dcblocker.cpp
similarity index 100%
rename from sflphone-common/src/audio/dcblocker.cpp
rename to daemon/src/audio/dcblocker.cpp
diff --git a/sflphone-common/src/audio/dcblocker.h b/daemon/src/audio/dcblocker.h
similarity index 100%
rename from sflphone-common/src/audio/dcblocker.h
rename to daemon/src/audio/dcblocker.h
diff --git a/sflphone-common/src/audio/delaydetection.cpp b/daemon/src/audio/delaydetection.cpp
similarity index 100%
rename from sflphone-common/src/audio/delaydetection.cpp
rename to daemon/src/audio/delaydetection.cpp
diff --git a/sflphone-common/src/audio/delaydetection.h b/daemon/src/audio/delaydetection.h
similarity index 100%
rename from sflphone-common/src/audio/delaydetection.h
rename to daemon/src/audio/delaydetection.h
diff --git a/sflphone-common/src/audio/echocancel.cpp b/daemon/src/audio/echocancel.cpp
similarity index 100%
rename from sflphone-common/src/audio/echocancel.cpp
rename to daemon/src/audio/echocancel.cpp
diff --git a/sflphone-common/src/audio/echocancel.h b/daemon/src/audio/echocancel.h
similarity index 100%
rename from sflphone-common/src/audio/echocancel.h
rename to daemon/src/audio/echocancel.h
diff --git a/sflphone-common/src/audio/echosuppress.cpp b/daemon/src/audio/echosuppress.cpp
similarity index 100%
rename from sflphone-common/src/audio/echosuppress.cpp
rename to daemon/src/audio/echosuppress.cpp
diff --git a/sflphone-common/src/audio/echosuppress.h b/daemon/src/audio/echosuppress.h
similarity index 100%
rename from sflphone-common/src/audio/echosuppress.h
rename to daemon/src/audio/echosuppress.h
diff --git a/sflphone-common/src/audio/gaincontrol.cpp b/daemon/src/audio/gaincontrol.cpp
similarity index 100%
rename from sflphone-common/src/audio/gaincontrol.cpp
rename to daemon/src/audio/gaincontrol.cpp
diff --git a/sflphone-common/src/audio/gaincontrol.h b/daemon/src/audio/gaincontrol.h
similarity index 100%
rename from sflphone-common/src/audio/gaincontrol.h
rename to daemon/src/audio/gaincontrol.h
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/daemon/src/audio/mainbuffer.cpp
similarity index 100%
rename from sflphone-common/src/audio/mainbuffer.cpp
rename to daemon/src/audio/mainbuffer.cpp
diff --git a/sflphone-common/src/audio/mainbuffer.h b/daemon/src/audio/mainbuffer.h
similarity index 100%
rename from sflphone-common/src/audio/mainbuffer.h
rename to daemon/src/audio/mainbuffer.h
diff --git a/sflphone-common/src/audio/noisesuppress.cpp b/daemon/src/audio/noisesuppress.cpp
similarity index 100%
rename from sflphone-common/src/audio/noisesuppress.cpp
rename to daemon/src/audio/noisesuppress.cpp
diff --git a/sflphone-common/src/audio/noisesuppress.h b/daemon/src/audio/noisesuppress.h
similarity index 100%
rename from sflphone-common/src/audio/noisesuppress.h
rename to daemon/src/audio/noisesuppress.h
diff --git a/sflphone-common/src/audio/pulseaudio/Makefile.am b/daemon/src/audio/pulseaudio/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/pulseaudio/Makefile.am
rename to daemon/src/audio/pulseaudio/Makefile.am
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.cpp b/daemon/src/audio/pulseaudio/audiostream.cpp
similarity index 100%
rename from sflphone-common/src/audio/pulseaudio/audiostream.cpp
rename to daemon/src/audio/pulseaudio/audiostream.cpp
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.h b/daemon/src/audio/pulseaudio/audiostream.h
similarity index 100%
rename from sflphone-common/src/audio/pulseaudio/audiostream.h
rename to daemon/src/audio/pulseaudio/audiostream.h
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp
similarity index 100%
rename from sflphone-common/src/audio/pulseaudio/pulselayer.cpp
rename to daemon/src/audio/pulseaudio/pulselayer.cpp
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.h b/daemon/src/audio/pulseaudio/pulselayer.h
similarity index 100%
rename from sflphone-common/src/audio/pulseaudio/pulselayer.h
rename to daemon/src/audio/pulseaudio/pulselayer.h
diff --git a/sflphone-common/src/audio/recordable.cpp b/daemon/src/audio/recordable.cpp
similarity index 100%
rename from sflphone-common/src/audio/recordable.cpp
rename to daemon/src/audio/recordable.cpp
diff --git a/sflphone-common/src/audio/recordable.h b/daemon/src/audio/recordable.h
similarity index 100%
rename from sflphone-common/src/audio/recordable.h
rename to daemon/src/audio/recordable.h
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/daemon/src/audio/ringbuffer.cpp
similarity index 100%
rename from sflphone-common/src/audio/ringbuffer.cpp
rename to daemon/src/audio/ringbuffer.cpp
diff --git a/sflphone-common/src/audio/ringbuffer.h b/daemon/src/audio/ringbuffer.h
similarity index 100%
rename from sflphone-common/src/audio/ringbuffer.h
rename to daemon/src/audio/ringbuffer.h
diff --git a/sflphone-common/src/audio/samplerateconverter.cpp b/daemon/src/audio/samplerateconverter.cpp
similarity index 100%
rename from sflphone-common/src/audio/samplerateconverter.cpp
rename to daemon/src/audio/samplerateconverter.cpp
diff --git a/sflphone-common/src/audio/samplerateconverter.h b/daemon/src/audio/samplerateconverter.h
similarity index 100%
rename from sflphone-common/src/audio/samplerateconverter.h
rename to daemon/src/audio/samplerateconverter.h
diff --git a/sflphone-common/src/audio/sound/Makefile.am b/daemon/src/audio/sound/Makefile.am
similarity index 100%
rename from sflphone-common/src/audio/sound/Makefile.am
rename to daemon/src/audio/sound/Makefile.am
diff --git a/sflphone-common/src/audio/sound/audiofile.cpp b/daemon/src/audio/sound/audiofile.cpp
similarity index 100%
rename from sflphone-common/src/audio/sound/audiofile.cpp
rename to daemon/src/audio/sound/audiofile.cpp
diff --git a/sflphone-common/src/audio/sound/audiofile.h b/daemon/src/audio/sound/audiofile.h
similarity index 100%
rename from sflphone-common/src/audio/sound/audiofile.h
rename to daemon/src/audio/sound/audiofile.h
diff --git a/sflphone-common/src/audio/sound/dtmf.cpp b/daemon/src/audio/sound/dtmf.cpp
similarity index 100%
rename from sflphone-common/src/audio/sound/dtmf.cpp
rename to daemon/src/audio/sound/dtmf.cpp
diff --git a/sflphone-common/src/audio/sound/dtmf.h b/daemon/src/audio/sound/dtmf.h
similarity index 100%
rename from sflphone-common/src/audio/sound/dtmf.h
rename to daemon/src/audio/sound/dtmf.h
diff --git a/sflphone-common/src/audio/sound/dtmfgenerator.cpp b/daemon/src/audio/sound/dtmfgenerator.cpp
similarity index 100%
rename from sflphone-common/src/audio/sound/dtmfgenerator.cpp
rename to daemon/src/audio/sound/dtmfgenerator.cpp
diff --git a/sflphone-common/src/audio/sound/dtmfgenerator.h b/daemon/src/audio/sound/dtmfgenerator.h
similarity index 100%
rename from sflphone-common/src/audio/sound/dtmfgenerator.h
rename to daemon/src/audio/sound/dtmfgenerator.h
diff --git a/sflphone-common/src/audio/sound/tone.cpp b/daemon/src/audio/sound/tone.cpp
similarity index 100%
rename from sflphone-common/src/audio/sound/tone.cpp
rename to daemon/src/audio/sound/tone.cpp
diff --git a/sflphone-common/src/audio/sound/tone.h b/daemon/src/audio/sound/tone.h
similarity index 100%
rename from sflphone-common/src/audio/sound/tone.h
rename to daemon/src/audio/sound/tone.h
diff --git a/sflphone-common/src/audio/sound/tonelist.cpp b/daemon/src/audio/sound/tonelist.cpp
similarity index 100%
rename from sflphone-common/src/audio/sound/tonelist.cpp
rename to daemon/src/audio/sound/tonelist.cpp
diff --git a/sflphone-common/src/audio/sound/tonelist.h b/daemon/src/audio/sound/tonelist.h
similarity index 100%
rename from sflphone-common/src/audio/sound/tonelist.h
rename to daemon/src/audio/sound/tonelist.h
diff --git a/sflphone-common/src/audio/speexechocancel.cpp b/daemon/src/audio/speexechocancel.cpp
similarity index 100%
rename from sflphone-common/src/audio/speexechocancel.cpp
rename to daemon/src/audio/speexechocancel.cpp
diff --git a/sflphone-common/src/audio/speexechocancel.h b/daemon/src/audio/speexechocancel.h
similarity index 100%
rename from sflphone-common/src/audio/speexechocancel.h
rename to daemon/src/audio/speexechocancel.h
diff --git a/sflphone-common/src/call.cpp b/daemon/src/call.cpp
similarity index 100%
rename from sflphone-common/src/call.cpp
rename to daemon/src/call.cpp
diff --git a/sflphone-common/src/call.h b/daemon/src/call.h
similarity index 100%
rename from sflphone-common/src/call.h
rename to daemon/src/call.h
diff --git a/sflphone-common/src/conference.cpp b/daemon/src/conference.cpp
similarity index 100%
rename from sflphone-common/src/conference.cpp
rename to daemon/src/conference.cpp
diff --git a/sflphone-common/src/conference.h b/daemon/src/conference.h
similarity index 100%
rename from sflphone-common/src/conference.h
rename to daemon/src/conference.h
diff --git a/sflphone-common/src/config/Makefile.am b/daemon/src/config/Makefile.am
similarity index 100%
rename from sflphone-common/src/config/Makefile.am
rename to daemon/src/config/Makefile.am
diff --git a/sflphone-common/src/config/config.cpp b/daemon/src/config/config.cpp
similarity index 100%
rename from sflphone-common/src/config/config.cpp
rename to daemon/src/config/config.cpp
diff --git a/sflphone-common/src/config/config.h b/daemon/src/config/config.h
similarity index 100%
rename from sflphone-common/src/config/config.h
rename to daemon/src/config/config.h
diff --git a/sflphone-common/src/config/engine.h b/daemon/src/config/engine.h
similarity index 100%
rename from sflphone-common/src/config/engine.h
rename to daemon/src/config/engine.h
diff --git a/sflphone-common/src/config/serializable.h b/daemon/src/config/serializable.h
similarity index 100%
rename from sflphone-common/src/config/serializable.h
rename to daemon/src/config/serializable.h
diff --git a/sflphone-common/src/config/yamlemitter.cpp b/daemon/src/config/yamlemitter.cpp
similarity index 100%
rename from sflphone-common/src/config/yamlemitter.cpp
rename to daemon/src/config/yamlemitter.cpp
diff --git a/sflphone-common/src/config/yamlemitter.h b/daemon/src/config/yamlemitter.h
similarity index 100%
rename from sflphone-common/src/config/yamlemitter.h
rename to daemon/src/config/yamlemitter.h
diff --git a/sflphone-common/src/config/yamlengine.cpp b/daemon/src/config/yamlengine.cpp
similarity index 100%
rename from sflphone-common/src/config/yamlengine.cpp
rename to daemon/src/config/yamlengine.cpp
diff --git a/sflphone-common/src/config/yamlengine.h b/daemon/src/config/yamlengine.h
similarity index 100%
rename from sflphone-common/src/config/yamlengine.h
rename to daemon/src/config/yamlengine.h
diff --git a/sflphone-common/src/config/yamlnode.cpp b/daemon/src/config/yamlnode.cpp
similarity index 100%
rename from sflphone-common/src/config/yamlnode.cpp
rename to daemon/src/config/yamlnode.cpp
diff --git a/sflphone-common/src/config/yamlnode.h b/daemon/src/config/yamlnode.h
similarity index 100%
rename from sflphone-common/src/config/yamlnode.h
rename to daemon/src/config/yamlnode.h
diff --git a/sflphone-common/src/config/yamlparser.cpp b/daemon/src/config/yamlparser.cpp
similarity index 100%
rename from sflphone-common/src/config/yamlparser.cpp
rename to daemon/src/config/yamlparser.cpp
diff --git a/sflphone-common/src/config/yamlparser.h b/daemon/src/config/yamlparser.h
similarity index 100%
rename from sflphone-common/src/config/yamlparser.h
rename to daemon/src/config/yamlparser.h
diff --git a/sflphone-common/src/dbus/Makefile.am b/daemon/src/dbus/Makefile.am
similarity index 100%
rename from sflphone-common/src/dbus/Makefile.am
rename to daemon/src/dbus/Makefile.am
diff --git a/sflphone-common/src/dbus/README b/daemon/src/dbus/README
similarity index 100%
rename from sflphone-common/src/dbus/README
rename to daemon/src/dbus/README
diff --git a/sflphone-client-gnome/src/dbus/callmanager-introspec.xml b/daemon/src/dbus/callmanager-introspec.xml
similarity index 100%
rename from sflphone-client-gnome/src/dbus/callmanager-introspec.xml
rename to daemon/src/dbus/callmanager-introspec.xml
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/daemon/src/dbus/callmanager.cpp
similarity index 100%
rename from sflphone-common/src/dbus/callmanager.cpp
rename to daemon/src/dbus/callmanager.cpp
diff --git a/sflphone-common/src/dbus/callmanager.h b/daemon/src/dbus/callmanager.h
similarity index 100%
rename from sflphone-common/src/dbus/callmanager.h
rename to daemon/src/dbus/callmanager.h
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/daemon/src/dbus/configurationmanager-introspec.xml
similarity index 100%
rename from sflphone-common/src/dbus/configurationmanager-introspec.xml
rename to daemon/src/dbus/configurationmanager-introspec.xml
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/daemon/src/dbus/configurationmanager.cpp
similarity index 100%
rename from sflphone-common/src/dbus/configurationmanager.cpp
rename to daemon/src/dbus/configurationmanager.cpp
diff --git a/sflphone-common/src/dbus/configurationmanager.h b/daemon/src/dbus/configurationmanager.h
similarity index 100%
rename from sflphone-common/src/dbus/configurationmanager.h
rename to daemon/src/dbus/configurationmanager.h
diff --git a/sflphone-client-gnome/src/dbus/contactmanager-introspec.xml b/daemon/src/dbus/contactmanager-introspec.xml
similarity index 100%
rename from sflphone-client-gnome/src/dbus/contactmanager-introspec.xml
rename to daemon/src/dbus/contactmanager-introspec.xml
diff --git a/sflphone-common/src/dbus/contactmanager.cpp b/daemon/src/dbus/contactmanager.cpp
similarity index 100%
rename from sflphone-common/src/dbus/contactmanager.cpp
rename to daemon/src/dbus/contactmanager.cpp
diff --git a/sflphone-common/src/dbus/contactmanager.h b/daemon/src/dbus/contactmanager.h
similarity index 100%
rename from sflphone-common/src/dbus/contactmanager.h
rename to daemon/src/dbus/contactmanager.h
diff --git a/sflphone-common/src/dbus/dbusmanager.h b/daemon/src/dbus/dbusmanager.h
similarity index 100%
rename from sflphone-common/src/dbus/dbusmanager.h
rename to daemon/src/dbus/dbusmanager.h
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.cpp b/daemon/src/dbus/dbusmanagerimpl.cpp
similarity index 100%
rename from sflphone-common/src/dbus/dbusmanagerimpl.cpp
rename to daemon/src/dbus/dbusmanagerimpl.cpp
diff --git a/sflphone-common/src/dbus/dbusmanagerimpl.h b/daemon/src/dbus/dbusmanagerimpl.h
similarity index 100%
rename from sflphone-common/src/dbus/dbusmanagerimpl.h
rename to daemon/src/dbus/dbusmanagerimpl.h
diff --git a/sflphone-client-gnome/src/dbus/instance-introspec.xml b/daemon/src/dbus/instance-introspec.xml
similarity index 100%
rename from sflphone-client-gnome/src/dbus/instance-introspec.xml
rename to daemon/src/dbus/instance-introspec.xml
diff --git a/sflphone-common/src/dbus/instance.cpp b/daemon/src/dbus/instance.cpp
similarity index 100%
rename from sflphone-common/src/dbus/instance.cpp
rename to daemon/src/dbus/instance.cpp
diff --git a/sflphone-common/src/dbus/instance.h b/daemon/src/dbus/instance.h
similarity index 100%
rename from sflphone-common/src/dbus/instance.h
rename to daemon/src/dbus/instance.h
diff --git a/sflphone-common/src/dbus/networkmanager.cpp b/daemon/src/dbus/networkmanager.cpp
similarity index 100%
rename from sflphone-common/src/dbus/networkmanager.cpp
rename to daemon/src/dbus/networkmanager.cpp
diff --git a/sflphone-common/src/dbus/networkmanager.h b/daemon/src/dbus/networkmanager.h
similarity index 100%
rename from sflphone-common/src/dbus/networkmanager.h
rename to daemon/src/dbus/networkmanager.h
diff --git a/sflphone-common/src/dbus/networkmanager_proxy.h b/daemon/src/dbus/networkmanager_proxy.h
similarity index 100%
rename from sflphone-common/src/dbus/networkmanager_proxy.h
rename to daemon/src/dbus/networkmanager_proxy.h
diff --git a/sflphone-common/src/dbus/org.freedesktop.NetworkManager.xml b/daemon/src/dbus/org.freedesktop.NetworkManager.xml
similarity index 100%
rename from sflphone-common/src/dbus/org.freedesktop.NetworkManager.xml
rename to daemon/src/dbus/org.freedesktop.NetworkManager.xml
diff --git a/sflphone-common/src/dbus/org.sflphone.SFLphone.service.in b/daemon/src/dbus/org.sflphone.SFLphone.service.in
similarity index 100%
rename from sflphone-common/src/dbus/org.sflphone.SFLphone.service.in
rename to daemon/src/dbus/org.sflphone.SFLphone.service.in
diff --git a/sflphone-common/src/eventthread.cpp b/daemon/src/eventthread.cpp
similarity index 100%
rename from sflphone-common/src/eventthread.cpp
rename to daemon/src/eventthread.cpp
diff --git a/sflphone-common/src/eventthread.h b/daemon/src/eventthread.h
similarity index 100%
rename from sflphone-common/src/eventthread.h
rename to daemon/src/eventthread.h
diff --git a/sflphone-common/src/fileutils.cpp b/daemon/src/fileutils.cpp
similarity index 100%
rename from sflphone-common/src/fileutils.cpp
rename to daemon/src/fileutils.cpp
diff --git a/sflphone-common/src/fileutils.h b/daemon/src/fileutils.h
similarity index 100%
rename from sflphone-common/src/fileutils.h
rename to daemon/src/fileutils.h
diff --git a/sflphone-common/src/global.h b/daemon/src/global.h
similarity index 100%
rename from sflphone-common/src/global.h
rename to daemon/src/global.h
diff --git a/sflphone-common/src/history/Makefile.am b/daemon/src/history/Makefile.am
similarity index 100%
rename from sflphone-common/src/history/Makefile.am
rename to daemon/src/history/Makefile.am
diff --git a/sflphone-common/src/history/historyitem.cpp b/daemon/src/history/historyitem.cpp
similarity index 100%
rename from sflphone-common/src/history/historyitem.cpp
rename to daemon/src/history/historyitem.cpp
diff --git a/sflphone-common/src/history/historyitem.h b/daemon/src/history/historyitem.h
similarity index 100%
rename from sflphone-common/src/history/historyitem.h
rename to daemon/src/history/historyitem.h
diff --git a/sflphone-common/src/history/historymanager.cpp b/daemon/src/history/historymanager.cpp
similarity index 100%
rename from sflphone-common/src/history/historymanager.cpp
rename to daemon/src/history/historymanager.cpp
diff --git a/sflphone-common/src/history/historymanager.h b/daemon/src/history/historymanager.h
similarity index 100%
rename from sflphone-common/src/history/historymanager.h
rename to daemon/src/history/historymanager.h
diff --git a/sflphone-common/src/hooks/Makefile.am b/daemon/src/hooks/Makefile.am
similarity index 100%
rename from sflphone-common/src/hooks/Makefile.am
rename to daemon/src/hooks/Makefile.am
diff --git a/sflphone-common/src/hooks/urlhook.cpp b/daemon/src/hooks/urlhook.cpp
similarity index 100%
rename from sflphone-common/src/hooks/urlhook.cpp
rename to daemon/src/hooks/urlhook.cpp
diff --git a/sflphone-common/src/hooks/urlhook.h b/daemon/src/hooks/urlhook.h
similarity index 100%
rename from sflphone-common/src/hooks/urlhook.h
rename to daemon/src/hooks/urlhook.h
diff --git a/sflphone-common/src/iax/Makefile.am b/daemon/src/iax/Makefile.am
similarity index 100%
rename from sflphone-common/src/iax/Makefile.am
rename to daemon/src/iax/Makefile.am
diff --git a/sflphone-common/src/iax/iaxaccount.cpp b/daemon/src/iax/iaxaccount.cpp
similarity index 100%
rename from sflphone-common/src/iax/iaxaccount.cpp
rename to daemon/src/iax/iaxaccount.cpp
diff --git a/sflphone-common/src/iax/iaxaccount.h b/daemon/src/iax/iaxaccount.h
similarity index 100%
rename from sflphone-common/src/iax/iaxaccount.h
rename to daemon/src/iax/iaxaccount.h
diff --git a/sflphone-common/src/iax/iaxcall.cpp b/daemon/src/iax/iaxcall.cpp
similarity index 100%
rename from sflphone-common/src/iax/iaxcall.cpp
rename to daemon/src/iax/iaxcall.cpp
diff --git a/sflphone-common/src/iax/iaxcall.h b/daemon/src/iax/iaxcall.h
similarity index 100%
rename from sflphone-common/src/iax/iaxcall.h
rename to daemon/src/iax/iaxcall.h
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/daemon/src/iax/iaxvoiplink.cpp
similarity index 100%
rename from sflphone-common/src/iax/iaxvoiplink.cpp
rename to daemon/src/iax/iaxvoiplink.cpp
diff --git a/sflphone-common/src/iax/iaxvoiplink.h b/daemon/src/iax/iaxvoiplink.h
similarity index 100%
rename from sflphone-common/src/iax/iaxvoiplink.h
rename to daemon/src/iax/iaxvoiplink.h
diff --git a/sflphone-common/src/im/InstantMessaging.cpp b/daemon/src/im/InstantMessaging.cpp
similarity index 100%
rename from sflphone-common/src/im/InstantMessaging.cpp
rename to daemon/src/im/InstantMessaging.cpp
diff --git a/sflphone-common/src/im/InstantMessaging.h b/daemon/src/im/InstantMessaging.h
similarity index 100%
rename from sflphone-common/src/im/InstantMessaging.h
rename to daemon/src/im/InstantMessaging.h
diff --git a/sflphone-common/src/im/Makefile.am b/daemon/src/im/Makefile.am
similarity index 100%
rename from sflphone-common/src/im/Makefile.am
rename to daemon/src/im/Makefile.am
diff --git a/sflphone-common/src/logger.cpp b/daemon/src/logger.cpp
similarity index 100%
rename from sflphone-common/src/logger.cpp
rename to daemon/src/logger.cpp
diff --git a/sflphone-common/src/logger.h b/daemon/src/logger.h
similarity index 100%
rename from sflphone-common/src/logger.h
rename to daemon/src/logger.h
diff --git a/sflphone-common/src/main.cpp b/daemon/src/main.cpp
similarity index 100%
rename from sflphone-common/src/main.cpp
rename to daemon/src/main.cpp
diff --git a/sflphone-common/src/manager.h b/daemon/src/manager.h
similarity index 100%
rename from sflphone-common/src/manager.h
rename to daemon/src/manager.h
diff --git a/sflphone-common/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
similarity index 100%
rename from sflphone-common/src/managerimpl.cpp
rename to daemon/src/managerimpl.cpp
diff --git a/sflphone-common/src/managerimpl.h b/daemon/src/managerimpl.h
similarity index 100%
rename from sflphone-common/src/managerimpl.h
rename to daemon/src/managerimpl.h
diff --git a/sflphone-common/src/managerimpl_registration.cpp b/daemon/src/managerimpl_registration.cpp
similarity index 100%
rename from sflphone-common/src/managerimpl_registration.cpp
rename to daemon/src/managerimpl_registration.cpp
diff --git a/sflphone-common/src/numbercleaner.cpp b/daemon/src/numbercleaner.cpp
similarity index 100%
rename from sflphone-common/src/numbercleaner.cpp
rename to daemon/src/numbercleaner.cpp
diff --git a/sflphone-common/src/numbercleaner.h b/daemon/src/numbercleaner.h
similarity index 100%
rename from sflphone-common/src/numbercleaner.h
rename to daemon/src/numbercleaner.h
diff --git a/sflphone-common/src/plug-in/Makefile.am b/daemon/src/plug-in/Makefile.am
similarity index 100%
rename from sflphone-common/src/plug-in/Makefile.am
rename to daemon/src/plug-in/Makefile.am
diff --git a/sflphone-common/src/plug-in/librarymanager.cpp b/daemon/src/plug-in/librarymanager.cpp
similarity index 100%
rename from sflphone-common/src/plug-in/librarymanager.cpp
rename to daemon/src/plug-in/librarymanager.cpp
diff --git a/sflphone-common/src/plug-in/librarymanager.h b/daemon/src/plug-in/librarymanager.h
similarity index 100%
rename from sflphone-common/src/plug-in/librarymanager.h
rename to daemon/src/plug-in/librarymanager.h
diff --git a/sflphone-common/src/plug-in/plugin.h b/daemon/src/plug-in/plugin.h
similarity index 100%
rename from sflphone-common/src/plug-in/plugin.h
rename to daemon/src/plug-in/plugin.h
diff --git a/sflphone-common/src/plug-in/pluginmanager.cpp b/daemon/src/plug-in/pluginmanager.cpp
similarity index 100%
rename from sflphone-common/src/plug-in/pluginmanager.cpp
rename to daemon/src/plug-in/pluginmanager.cpp
diff --git a/sflphone-common/src/plug-in/pluginmanager.h b/daemon/src/plug-in/pluginmanager.h
similarity index 100%
rename from sflphone-common/src/plug-in/pluginmanager.h
rename to daemon/src/plug-in/pluginmanager.h
diff --git a/sflphone-common/src/plug-in/test/Makefile.am b/daemon/src/plug-in/test/Makefile.am
similarity index 100%
rename from sflphone-common/src/plug-in/test/Makefile.am
rename to daemon/src/plug-in/test/Makefile.am
diff --git a/sflphone-common/src/plug-in/test/pluginTest.cpp b/daemon/src/plug-in/test/pluginTest.cpp
similarity index 100%
rename from sflphone-common/src/plug-in/test/pluginTest.cpp
rename to daemon/src/plug-in/test/pluginTest.cpp
diff --git a/sflphone-common/src/preferences.cpp b/daemon/src/preferences.cpp
similarity index 100%
rename from sflphone-common/src/preferences.cpp
rename to daemon/src/preferences.cpp
diff --git a/sflphone-common/src/preferences.h b/daemon/src/preferences.h
similarity index 100%
rename from sflphone-common/src/preferences.h
rename to daemon/src/preferences.h
diff --git a/sflphone-common/src/sip/Makefile.am b/daemon/src/sip/Makefile.am
similarity index 100%
rename from sflphone-common/src/sip/Makefile.am
rename to daemon/src/sip/Makefile.am
diff --git a/sflphone-common/src/sip/Pattern.cpp b/daemon/src/sip/Pattern.cpp
similarity index 100%
rename from sflphone-common/src/sip/Pattern.cpp
rename to daemon/src/sip/Pattern.cpp
diff --git a/sflphone-common/src/sip/Pattern.h b/daemon/src/sip/Pattern.h
similarity index 100%
rename from sflphone-common/src/sip/Pattern.h
rename to daemon/src/sip/Pattern.h
diff --git a/sflphone-common/src/sip/SdesNegotiator.cpp b/daemon/src/sip/SdesNegotiator.cpp
similarity index 100%
rename from sflphone-common/src/sip/SdesNegotiator.cpp
rename to daemon/src/sip/SdesNegotiator.cpp
diff --git a/sflphone-common/src/sip/SdesNegotiator.h b/daemon/src/sip/SdesNegotiator.h
similarity index 100%
rename from sflphone-common/src/sip/SdesNegotiator.h
rename to daemon/src/sip/SdesNegotiator.h
diff --git a/sflphone-common/src/sip/sdp.cpp b/daemon/src/sip/sdp.cpp
similarity index 100%
rename from sflphone-common/src/sip/sdp.cpp
rename to daemon/src/sip/sdp.cpp
diff --git a/sflphone-common/src/sip/sdp.h b/daemon/src/sip/sdp.h
similarity index 100%
rename from sflphone-common/src/sip/sdp.h
rename to daemon/src/sip/sdp.h
diff --git a/sflphone-common/src/sip/sdpmedia.cpp b/daemon/src/sip/sdpmedia.cpp
similarity index 100%
rename from sflphone-common/src/sip/sdpmedia.cpp
rename to daemon/src/sip/sdpmedia.cpp
diff --git a/sflphone-common/src/sip/sdpmedia.h b/daemon/src/sip/sdpmedia.h
similarity index 100%
rename from sflphone-common/src/sip/sdpmedia.h
rename to daemon/src/sip/sdpmedia.h
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp
similarity index 100%
rename from sflphone-common/src/sip/sipaccount.cpp
rename to daemon/src/sip/sipaccount.cpp
diff --git a/sflphone-common/src/sip/sipaccount.h b/daemon/src/sip/sipaccount.h
similarity index 100%
rename from sflphone-common/src/sip/sipaccount.h
rename to daemon/src/sip/sipaccount.h
diff --git a/sflphone-common/src/sip/sipcall.cpp b/daemon/src/sip/sipcall.cpp
similarity index 100%
rename from sflphone-common/src/sip/sipcall.cpp
rename to daemon/src/sip/sipcall.cpp
diff --git a/sflphone-common/src/sip/sipcall.h b/daemon/src/sip/sipcall.h
similarity index 100%
rename from sflphone-common/src/sip/sipcall.h
rename to daemon/src/sip/sipcall.h
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
similarity index 100%
rename from sflphone-common/src/sip/sipvoiplink.cpp
rename to daemon/src/sip/sipvoiplink.cpp
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/daemon/src/sip/sipvoiplink.h
similarity index 100%
rename from sflphone-common/src/sip/sipvoiplink.h
rename to daemon/src/sip/sipvoiplink.h
diff --git a/sflphone-common/src/voiplink.cpp b/daemon/src/voiplink.cpp
similarity index 100%
rename from sflphone-common/src/voiplink.cpp
rename to daemon/src/voiplink.cpp
diff --git a/sflphone-common/src/voiplink.h b/daemon/src/voiplink.h
similarity index 100%
rename from sflphone-common/src/voiplink.h
rename to daemon/src/voiplink.h
diff --git a/sflphone-common/test/.gitignore b/daemon/test/.gitignore
similarity index 100%
rename from sflphone-common/test/.gitignore
rename to daemon/test/.gitignore
diff --git a/sflphone-common/test/Makefile.am b/daemon/test/Makefile.am
similarity index 100%
rename from sflphone-common/test/Makefile.am
rename to daemon/test/Makefile.am
diff --git a/sflphone-common/test/accounttest.cpp b/daemon/test/accounttest.cpp
similarity index 100%
rename from sflphone-common/test/accounttest.cpp
rename to daemon/test/accounttest.cpp
diff --git a/sflphone-common/test/accounttest.h b/daemon/test/accounttest.h
similarity index 100%
rename from sflphone-common/test/accounttest.h
rename to daemon/test/accounttest.h
diff --git a/sflphone-common/test/audiolayertest.cpp b/daemon/test/audiolayertest.cpp
similarity index 100%
rename from sflphone-common/test/audiolayertest.cpp
rename to daemon/test/audiolayertest.cpp
diff --git a/sflphone-common/test/audiolayertest.h b/daemon/test/audiolayertest.h
similarity index 100%
rename from sflphone-common/test/audiolayertest.h
rename to daemon/test/audiolayertest.h
diff --git a/sflphone-common/test/configurationtest.cpp b/daemon/test/configurationtest.cpp
similarity index 100%
rename from sflphone-common/test/configurationtest.cpp
rename to daemon/test/configurationtest.cpp
diff --git a/sflphone-common/test/configurationtest.h b/daemon/test/configurationtest.h
similarity index 100%
rename from sflphone-common/test/configurationtest.h
rename to daemon/test/configurationtest.h
diff --git a/sflphone-common/test/constants.h b/daemon/test/constants.h
similarity index 100%
rename from sflphone-common/test/constants.h
rename to daemon/test/constants.h
diff --git a/sflphone-common/test/delaydetectiontest.cpp b/daemon/test/delaydetectiontest.cpp
similarity index 100%
rename from sflphone-common/test/delaydetectiontest.cpp
rename to daemon/test/delaydetectiontest.cpp
diff --git a/sflphone-common/test/delaydetectiontest.h b/daemon/test/delaydetectiontest.h
similarity index 100%
rename from sflphone-common/test/delaydetectiontest.h
rename to daemon/test/delaydetectiontest.h
diff --git a/sflphone-common/test/echocanceltest.cpp b/daemon/test/echocanceltest.cpp
similarity index 100%
rename from sflphone-common/test/echocanceltest.cpp
rename to daemon/test/echocanceltest.cpp
diff --git a/sflphone-common/test/echocanceltest.h b/daemon/test/echocanceltest.h
similarity index 100%
rename from sflphone-common/test/echocanceltest.h
rename to daemon/test/echocanceltest.h
diff --git a/sflphone-common/test/gaincontroltest.cpp b/daemon/test/gaincontroltest.cpp
similarity index 100%
rename from sflphone-common/test/gaincontroltest.cpp
rename to daemon/test/gaincontroltest.cpp
diff --git a/sflphone-common/test/gaincontroltest.h b/daemon/test/gaincontroltest.h
similarity index 100%
rename from sflphone-common/test/gaincontroltest.h
rename to daemon/test/gaincontroltest.h
diff --git a/sflphone-common/test/history-sample.tpl b/daemon/test/history-sample.tpl
similarity index 100%
rename from sflphone-common/test/history-sample.tpl
rename to daemon/test/history-sample.tpl
diff --git a/sflphone-common/test/historytest.cpp b/daemon/test/historytest.cpp
similarity index 100%
rename from sflphone-common/test/historytest.cpp
rename to daemon/test/historytest.cpp
diff --git a/sflphone-common/test/historytest.h b/daemon/test/historytest.h
similarity index 100%
rename from sflphone-common/test/historytest.h
rename to daemon/test/historytest.h
diff --git a/sflphone-common/test/hookmanagertest.cpp b/daemon/test/hookmanagertest.cpp
similarity index 100%
rename from sflphone-common/test/hookmanagertest.cpp
rename to daemon/test/hookmanagertest.cpp
diff --git a/sflphone-common/test/hookmanagertest.h b/daemon/test/hookmanagertest.h
similarity index 100%
rename from sflphone-common/test/hookmanagertest.h
rename to daemon/test/hookmanagertest.h
diff --git a/sflphone-common/test/instantmessagingtest.cpp b/daemon/test/instantmessagingtest.cpp
similarity index 100%
rename from sflphone-common/test/instantmessagingtest.cpp
rename to daemon/test/instantmessagingtest.cpp
diff --git a/sflphone-common/test/instantmessagingtest.h b/daemon/test/instantmessagingtest.h
similarity index 100%
rename from sflphone-common/test/instantmessagingtest.h
rename to daemon/test/instantmessagingtest.h
diff --git a/sflphone-common/test/main.cpp b/daemon/test/main.cpp
similarity index 100%
rename from sflphone-common/test/main.cpp
rename to daemon/test/main.cpp
diff --git a/sflphone-common/test/mainbuffertest.cpp b/daemon/test/mainbuffertest.cpp
similarity index 100%
rename from sflphone-common/test/mainbuffertest.cpp
rename to daemon/test/mainbuffertest.cpp
diff --git a/sflphone-common/test/mainbuffertest.h b/daemon/test/mainbuffertest.h
similarity index 100%
rename from sflphone-common/test/mainbuffertest.h
rename to daemon/test/mainbuffertest.h
diff --git a/sflphone-common/test/numbercleanertest.cpp b/daemon/test/numbercleanertest.cpp
similarity index 100%
rename from sflphone-common/test/numbercleanertest.cpp
rename to daemon/test/numbercleanertest.cpp
diff --git a/sflphone-common/test/numbercleanertest.h b/daemon/test/numbercleanertest.h
similarity index 100%
rename from sflphone-common/test/numbercleanertest.h
rename to daemon/test/numbercleanertest.h
diff --git a/sflphone-common/test/pluginmanagertest.cpp b/daemon/test/pluginmanagertest.cpp
similarity index 100%
rename from sflphone-common/test/pluginmanagertest.cpp
rename to daemon/test/pluginmanagertest.cpp
diff --git a/sflphone-common/test/pluginmanagertest.h b/daemon/test/pluginmanagertest.h
similarity index 100%
rename from sflphone-common/test/pluginmanagertest.h
rename to daemon/test/pluginmanagertest.h
diff --git a/sflphone-common/test/ringtonetest.cpp b/daemon/test/ringtonetest.cpp
similarity index 100%
rename from sflphone-common/test/ringtonetest.cpp
rename to daemon/test/ringtonetest.cpp
diff --git a/sflphone-common/test/ringtonetest.h b/daemon/test/ringtonetest.h
similarity index 100%
rename from sflphone-common/test/ringtonetest.h
rename to daemon/test/ringtonetest.h
diff --git a/sflphone-common/test/rtptest.cpp b/daemon/test/rtptest.cpp
similarity index 100%
rename from sflphone-common/test/rtptest.cpp
rename to daemon/test/rtptest.cpp
diff --git a/sflphone-common/test/rtptest.h b/daemon/test/rtptest.h
similarity index 100%
rename from sflphone-common/test/rtptest.h
rename to daemon/test/rtptest.h
diff --git a/sflphone-common/test/run_tests.sh b/daemon/test/run_tests.sh
similarity index 100%
rename from sflphone-common/test/run_tests.sh
rename to daemon/test/run_tests.sh
diff --git a/sflphone-common/test/sdesnegotiatortest.cpp b/daemon/test/sdesnegotiatortest.cpp
similarity index 100%
rename from sflphone-common/test/sdesnegotiatortest.cpp
rename to daemon/test/sdesnegotiatortest.cpp
diff --git a/sflphone-common/test/sdesnegotiatortest.h b/daemon/test/sdesnegotiatortest.h
similarity index 100%
rename from sflphone-common/test/sdesnegotiatortest.h
rename to daemon/test/sdesnegotiatortest.h
diff --git a/sflphone-common/test/sdptest.cpp b/daemon/test/sdptest.cpp
similarity index 100%
rename from sflphone-common/test/sdptest.cpp
rename to daemon/test/sdptest.cpp
diff --git a/sflphone-common/test/sdptest.h b/daemon/test/sdptest.h
similarity index 100%
rename from sflphone-common/test/sdptest.h
rename to daemon/test/sdptest.h
diff --git a/sflphone-common/test/sflphoned-sample.yml b/daemon/test/sflphoned-sample.yml
similarity index 100%
rename from sflphone-common/test/sflphoned-sample.yml
rename to daemon/test/sflphoned-sample.yml
diff --git a/sflphone-common/test/sflphonedrc-sample b/daemon/test/sflphonedrc-sample
similarity index 100%
rename from sflphone-common/test/sflphonedrc-sample
rename to daemon/test/sflphonedrc-sample
diff --git a/sflphone-common/test/sippxml/test_1.xml b/daemon/test/sippxml/test_1.xml
similarity index 100%
rename from sflphone-common/test/sippxml/test_1.xml
rename to daemon/test/sippxml/test_1.xml
diff --git a/sflphone-common/test/sippxml/test_2.xml b/daemon/test/sippxml/test_2.xml
similarity index 100%
rename from sflphone-common/test/sippxml/test_2.xml
rename to daemon/test/sippxml/test_2.xml
diff --git a/sflphone-common/test/sippxml/test_3.xml b/daemon/test/sippxml/test_3.xml
similarity index 100%
rename from sflphone-common/test/sippxml/test_3.xml
rename to daemon/test/sippxml/test_3.xml
diff --git a/sflphone-common/test/sippxml/test_4.xml b/daemon/test/sippxml/test_4.xml
similarity index 100%
rename from sflphone-common/test/sippxml/test_4.xml
rename to daemon/test/sippxml/test_4.xml
diff --git a/sflphone-common/test/siptest.cpp b/daemon/test/siptest.cpp
similarity index 100%
rename from sflphone-common/test/siptest.cpp
rename to daemon/test/siptest.cpp
diff --git a/sflphone-common/test/siptest.h b/daemon/test/siptest.h
similarity index 100%
rename from sflphone-common/test/siptest.h
rename to daemon/test/siptest.h
diff --git a/sflphone-common/test/validator.cpp b/daemon/test/validator.cpp
similarity index 100%
rename from sflphone-common/test/validator.cpp
rename to daemon/test/validator.cpp
diff --git a/sflphone-common/test/validator.h b/daemon/test/validator.h
similarity index 100%
rename from sflphone-common/test/validator.h
rename to daemon/test/validator.h
diff --git a/sflphone-common/test/waveSample/M1F1-int16WE-AFsp.wav b/daemon/test/waveSample/M1F1-int16WE-AFsp.wav
similarity index 100%
rename from sflphone-common/test/waveSample/M1F1-int16WE-AFsp.wav
rename to daemon/test/waveSample/M1F1-int16WE-AFsp.wav
diff --git a/sflphone-common/test/ymlParser.yml b/daemon/test/ymlParser.yml
similarity index 100%
rename from sflphone-common/test/ymlParser.yml
rename to daemon/test/ymlParser.yml
diff --git a/sflphone-client-gnome/.cproject b/gnome/.cproject
similarity index 100%
rename from sflphone-client-gnome/.cproject
rename to gnome/.cproject
diff --git a/sflphone-client-gnome/.project b/gnome/.project
similarity index 100%
rename from sflphone-client-gnome/.project
rename to gnome/.project
diff --git a/sflphone-client-gnome/.settings/org.eclipse.cdt.core.prefs b/gnome/.settings/org.eclipse.cdt.core.prefs
similarity index 100%
rename from sflphone-client-gnome/.settings/org.eclipse.cdt.core.prefs
rename to gnome/.settings/org.eclipse.cdt.core.prefs
diff --git a/sflphone-client-gnome/.settings/org.eclipse.cdt.ui.prefs b/gnome/.settings/org.eclipse.cdt.ui.prefs
similarity index 100%
rename from sflphone-client-gnome/.settings/org.eclipse.cdt.ui.prefs
rename to gnome/.settings/org.eclipse.cdt.ui.prefs
diff --git a/sflphone-client-gnome/.settings/org.eclipse.ltk.core.refactoring.prefs b/gnome/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from sflphone-client-gnome/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to gnome/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/sflphone-common/libs/iax2/AUTHORS b/gnome/AUTHORS
similarity index 100%
rename from sflphone-common/libs/iax2/AUTHORS
rename to gnome/AUTHORS
diff --git a/sflphone-client-gnome/COPYING b/gnome/COPYING
similarity index 100%
rename from sflphone-client-gnome/COPYING
rename to gnome/COPYING
diff --git a/sflphone-client-gnome/ChangeLog b/gnome/ChangeLog
similarity index 100%
rename from sflphone-client-gnome/ChangeLog
rename to gnome/ChangeLog
diff --git a/sflphone-client-gnome/INSTALL b/gnome/INSTALL
similarity index 100%
rename from sflphone-client-gnome/INSTALL
rename to gnome/INSTALL
diff --git a/sflphone-client-gnome/Makefile.am b/gnome/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/Makefile.am
rename to gnome/Makefile.am
diff --git a/sflphone-client-gnome/NEWS b/gnome/NEWS
similarity index 100%
rename from sflphone-client-gnome/NEWS
rename to gnome/NEWS
diff --git a/sflphone-client-gnome/README b/gnome/README
similarity index 100%
rename from sflphone-client-gnome/README
rename to gnome/README
diff --git a/sflphone-common/VERSION b/gnome/VERSION
similarity index 100%
rename from sflphone-common/VERSION
rename to gnome/VERSION
diff --git a/sflphone-client-gnome/autogen.sh b/gnome/autogen.sh
similarity index 100%
rename from sflphone-client-gnome/autogen.sh
rename to gnome/autogen.sh
diff --git a/sflphone-client-gnome/configure.ac b/gnome/configure.ac
similarity index 100%
rename from sflphone-client-gnome/configure.ac
rename to gnome/configure.ac
diff --git a/sflphone-client-gnome/doc/C/README b/gnome/doc/C/README
similarity index 100%
rename from sflphone-client-gnome/doc/C/README
rename to gnome/doc/C/README
diff --git a/sflphone-client-gnome/doc/C/figures/account_advanced.png b/gnome/doc/C/figures/account_advanced.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/account_advanced.png
rename to gnome/doc/C/figures/account_advanced.png
diff --git a/sflphone-client-gnome/doc/C/figures/account_registration.png b/gnome/doc/C/figures/account_registration.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/account_registration.png
rename to gnome/doc/C/figures/account_registration.png
diff --git a/sflphone-client-gnome/doc/C/figures/accounts_security.png b/gnome/doc/C/figures/accounts_security.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/accounts_security.png
rename to gnome/doc/C/figures/accounts_security.png
diff --git a/sflphone-client-gnome/doc/C/figures/addressbook-button.png b/gnome/doc/C/figures/addressbook-button.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/addressbook-button.png
rename to gnome/doc/C/figures/addressbook-button.png
diff --git a/sflphone-client-gnome/doc/C/figures/answer.png b/gnome/doc/C/figures/answer.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/answer.png
rename to gnome/doc/C/figures/answer.png
diff --git a/sflphone-client-gnome/doc/C/figures/call-second.png b/gnome/doc/C/figures/call-second.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/call-second.png
rename to gnome/doc/C/figures/call-second.png
diff --git a/sflphone-client-gnome/doc/C/figures/call.png b/gnome/doc/C/figures/call.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/call.png
rename to gnome/doc/C/figures/call.png
diff --git a/sflphone-client-gnome/doc/C/figures/callshistory-settings.png b/gnome/doc/C/figures/callshistory-settings.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/callshistory-settings.png
rename to gnome/doc/C/figures/callshistory-settings.png
diff --git a/sflphone-client-gnome/doc/C/figures/conference.png b/gnome/doc/C/figures/conference.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/conference.png
rename to gnome/doc/C/figures/conference.png
diff --git a/sflphone-client-gnome/doc/C/figures/conference_attached.png b/gnome/doc/C/figures/conference_attached.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/conference_attached.png
rename to gnome/doc/C/figures/conference_attached.png
diff --git a/sflphone-client-gnome/doc/C/figures/conference_detached.png b/gnome/doc/C/figures/conference_detached.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/conference_detached.png
rename to gnome/doc/C/figures/conference_detached.png
diff --git a/sflphone-client-gnome/doc/C/figures/configfile-settings.png b/gnome/doc/C/figures/configfile-settings.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/configfile-settings.png
rename to gnome/doc/C/figures/configfile-settings.png
diff --git a/sflphone-client-gnome/doc/C/figures/desktop-notif-settings.png b/gnome/doc/C/figures/desktop-notif-settings.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/desktop-notif-settings.png
rename to gnome/doc/C/figures/desktop-notif-settings.png
diff --git a/sflphone-client-gnome/doc/C/figures/dial.png b/gnome/doc/C/figures/dial.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/dial.png
rename to gnome/doc/C/figures/dial.png
diff --git a/sflphone-client-gnome/doc/C/figures/drag_n_drop.png b/gnome/doc/C/figures/drag_n_drop.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/drag_n_drop.png
rename to gnome/doc/C/figures/drag_n_drop.png
diff --git a/sflphone-client-gnome/doc/C/figures/hangup.png b/gnome/doc/C/figures/hangup.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/hangup.png
rename to gnome/doc/C/figures/hangup.png
diff --git a/sflphone-client-gnome/doc/C/figures/history.png b/gnome/doc/C/figures/history.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/history.png
rename to gnome/doc/C/figures/history.png
diff --git a/sflphone-client-gnome/doc/C/figures/holdoff.png b/gnome/doc/C/figures/holdoff.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/holdoff.png
rename to gnome/doc/C/figures/holdoff.png
diff --git a/sflphone-client-gnome/doc/C/figures/holdon.png b/gnome/doc/C/figures/holdon.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/holdon.png
rename to gnome/doc/C/figures/holdon.png
diff --git a/sflphone-client-gnome/doc/C/figures/notif-example.png b/gnome/doc/C/figures/notif-example.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/notif-example.png
rename to gnome/doc/C/figures/notif-example.png
diff --git a/sflphone-client-gnome/doc/C/figures/rec-settings.png b/gnome/doc/C/figures/rec-settings.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/rec-settings.png
rename to gnome/doc/C/figures/rec-settings.png
diff --git a/sflphone-client-gnome/doc/C/figures/record.png b/gnome/doc/C/figures/record.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/record.png
rename to gnome/doc/C/figures/record.png
diff --git a/sflphone-client-gnome/doc/C/figures/refuse.png b/gnome/doc/C/figures/refuse.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/refuse.png
rename to gnome/doc/C/figures/refuse.png
diff --git a/sflphone-client-gnome/doc/C/figures/srtp_enabled.png b/gnome/doc/C/figures/srtp_enabled.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/srtp_enabled.png
rename to gnome/doc/C/figures/srtp_enabled.png
diff --git a/sflphone-client-gnome/doc/C/figures/systemtray-settings.png b/gnome/doc/C/figures/systemtray-settings.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/systemtray-settings.png
rename to gnome/doc/C/figures/systemtray-settings.png
diff --git a/sflphone-client-gnome/doc/C/figures/transfer-go.png b/gnome/doc/C/figures/transfer-go.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/transfer-go.png
rename to gnome/doc/C/figures/transfer-go.png
diff --git a/sflphone-client-gnome/doc/C/figures/transfer.png b/gnome/doc/C/figures/transfer.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/transfer.png
rename to gnome/doc/C/figures/transfer.png
diff --git a/sflphone-client-gnome/doc/C/figures/voicemail-notif.png b/gnome/doc/C/figures/voicemail-notif.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/voicemail-notif.png
rename to gnome/doc/C/figures/voicemail-notif.png
diff --git a/sflphone-client-gnome/doc/C/figures/voicemail.png b/gnome/doc/C/figures/voicemail.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/voicemail.png
rename to gnome/doc/C/figures/voicemail.png
diff --git a/sflphone-client-gnome/doc/C/figures/zrtp_options.png b/gnome/doc/C/figures/zrtp_options.png
similarity index 100%
rename from sflphone-client-gnome/doc/C/figures/zrtp_options.png
rename to gnome/doc/C/figures/zrtp_options.png
diff --git a/sflphone-client-gnome/doc/C/legal.xml b/gnome/doc/C/legal.xml
similarity index 100%
rename from sflphone-client-gnome/doc/C/legal.xml
rename to gnome/doc/C/legal.xml
diff --git a/sflphone-client-gnome/doc/C/sflphone-usermanual.pot b/gnome/doc/C/sflphone-usermanual.pot
similarity index 100%
rename from sflphone-client-gnome/doc/C/sflphone-usermanual.pot
rename to gnome/doc/C/sflphone-usermanual.pot
diff --git a/sflphone-client-gnome/doc/C/sflphone.xml b/gnome/doc/C/sflphone.xml
similarity index 100%
rename from sflphone-client-gnome/doc/C/sflphone.xml
rename to gnome/doc/C/sflphone.xml
diff --git a/sflphone-client-gnome/doc/Changelog b/gnome/doc/Changelog
similarity index 100%
rename from sflphone-client-gnome/doc/Changelog
rename to gnome/doc/Changelog
diff --git a/sflphone-client-gnome/doc/Makefile.am b/gnome/doc/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/doc/Makefile.am
rename to gnome/doc/Makefile.am
diff --git a/sflphone-client-gnome/doc/es/es.po b/gnome/doc/es/es.po
similarity index 100%
rename from sflphone-client-gnome/doc/es/es.po
rename to gnome/doc/es/es.po
diff --git a/sflphone-client-gnome/doc/fr/fr.po b/gnome/doc/fr/fr.po
similarity index 100%
rename from sflphone-client-gnome/doc/fr/fr.po
rename to gnome/doc/fr/fr.po
diff --git a/sflphone-client-gnome/doc/sflphone.omf.in b/gnome/doc/sflphone.omf.in
similarity index 100%
rename from sflphone-client-gnome/doc/sflphone.omf.in
rename to gnome/doc/sflphone.omf.in
diff --git a/sflphone-client-gnome/globals.mak b/gnome/globals.mak
similarity index 100%
rename from sflphone-client-gnome/globals.mak
rename to gnome/globals.mak
diff --git a/sflphone-client-gnome/man/Makefile.am b/gnome/man/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/man/Makefile.am
rename to gnome/man/Makefile.am
diff --git a/sflphone-client-kde/man/README.manpages b/gnome/man/README.manpages
similarity index 100%
rename from sflphone-client-kde/man/README.manpages
rename to gnome/man/README.manpages
diff --git a/sflphone-client-gnome/man/sflphone-client-gnome.pod b/gnome/man/sflphone-client-gnome.pod
similarity index 100%
rename from sflphone-client-gnome/man/sflphone-client-gnome.pod
rename to gnome/man/sflphone-client-gnome.pod
diff --git a/sflphone-client-gnome/man/sflphone.pod b/gnome/man/sflphone.pod
similarity index 100%
rename from sflphone-client-gnome/man/sflphone.pod
rename to gnome/man/sflphone.pod
diff --git a/sflphone-client-gnome/pixmaps/Makefile.am b/gnome/pixmaps/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/pixmaps/Makefile.am
rename to gnome/pixmaps/Makefile.am
diff --git a/sflphone-client-gnome/pixmaps/accept.svg b/gnome/pixmaps/accept.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/accept.svg
rename to gnome/pixmaps/accept.svg
diff --git a/sflphone-client-gnome/pixmaps/addressbook.svg b/gnome/pixmaps/addressbook.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/addressbook.svg
rename to gnome/pixmaps/addressbook.svg
diff --git a/sflphone-client-gnome/pixmaps/busy.svg b/gnome/pixmaps/busy.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/busy.svg
rename to gnome/pixmaps/busy.svg
diff --git a/sflphone-client-gnome/pixmaps/call.svg b/gnome/pixmaps/call.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/call.svg
rename to gnome/pixmaps/call.svg
diff --git a/sflphone-client-gnome/pixmaps/contact_default.svg b/gnome/pixmaps/contact_default.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/contact_default.svg
rename to gnome/pixmaps/contact_default.svg
diff --git a/sflphone-client-gnome/pixmaps/current.svg b/gnome/pixmaps/current.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/current.svg
rename to gnome/pixmaps/current.svg
diff --git a/sflphone-client-gnome/pixmaps/dial.svg b/gnome/pixmaps/dial.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/dial.svg
rename to gnome/pixmaps/dial.svg
diff --git a/sflphone-client-gnome/pixmaps/face-monkey.svg b/gnome/pixmaps/face-monkey.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/face-monkey.svg
rename to gnome/pixmaps/face-monkey.svg
diff --git a/sflphone-client-gnome/pixmaps/fail.svg b/gnome/pixmaps/fail.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/fail.svg
rename to gnome/pixmaps/fail.svg
diff --git a/sflphone-client-gnome/pixmaps/hang_up.svg b/gnome/pixmaps/hang_up.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/hang_up.svg
rename to gnome/pixmaps/hang_up.svg
diff --git a/sflphone-client-gnome/pixmaps/history2.svg b/gnome/pixmaps/history2.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/history2.svg
rename to gnome/pixmaps/history2.svg
diff --git a/sflphone-client-gnome/pixmaps/hold.svg b/gnome/pixmaps/hold.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/hold.svg
rename to gnome/pixmaps/hold.svg
diff --git a/sflphone-client-gnome/pixmaps/home.svg b/gnome/pixmaps/home.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/home.svg
rename to gnome/pixmaps/home.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_accept.svg b/gnome/pixmaps/icon_accept.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_accept.svg
rename to gnome/pixmaps/icon_accept.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_call.svg b/gnome/pixmaps/icon_call.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_call.svg
rename to gnome/pixmaps/icon_call.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_dialpad.svg b/gnome/pixmaps/icon_dialpad.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_dialpad.svg
rename to gnome/pixmaps/icon_dialpad.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_dialpad_off.svg b/gnome/pixmaps/icon_dialpad_off.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_dialpad_off.svg
rename to gnome/pixmaps/icon_dialpad_off.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_hangup.svg b/gnome/pixmaps/icon_hangup.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_hangup.svg
rename to gnome/pixmaps/icon_hangup.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_hold.svg b/gnome/pixmaps/icon_hold.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_hold.svg
rename to gnome/pixmaps/icon_hold.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_rec.svg b/gnome/pixmaps/icon_rec.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_rec.svg
rename to gnome/pixmaps/icon_rec.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_unhold.svg b/gnome/pixmaps/icon_unhold.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_unhold.svg
rename to gnome/pixmaps/icon_unhold.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_volume.svg b/gnome/pixmaps/icon_volume.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_volume.svg
rename to gnome/pixmaps/icon_volume.svg
diff --git a/sflphone-client-gnome/pixmaps/icon_volume_off.svg b/gnome/pixmaps/icon_volume_off.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/icon_volume_off.svg
rename to gnome/pixmaps/icon_volume_off.svg
diff --git a/sflphone-client-gnome/pixmaps/im.svg b/gnome/pixmaps/im.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/im.svg
rename to gnome/pixmaps/im.svg
diff --git a/sflphone-client-gnome/pixmaps/incoming.svg b/gnome/pixmaps/incoming.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/incoming.svg
rename to gnome/pixmaps/incoming.svg
diff --git a/sflphone-client-gnome/pixmaps/lock_certified.svg b/gnome/pixmaps/lock_certified.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/lock_certified.svg
rename to gnome/pixmaps/lock_certified.svg
diff --git a/sflphone-client-gnome/pixmaps/lock_confirmed.svg b/gnome/pixmaps/lock_confirmed.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/lock_confirmed.svg
rename to gnome/pixmaps/lock_confirmed.svg
diff --git a/sflphone-client-gnome/pixmaps/lock_error.svg b/gnome/pixmaps/lock_error.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/lock_error.svg
rename to gnome/pixmaps/lock_error.svg
diff --git a/sflphone-client-gnome/pixmaps/lock_off.svg b/gnome/pixmaps/lock_off.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/lock_off.svg
rename to gnome/pixmaps/lock_off.svg
diff --git a/sflphone-client-gnome/pixmaps/lock_unconfirmed.svg b/gnome/pixmaps/lock_unconfirmed.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/lock_unconfirmed.svg
rename to gnome/pixmaps/lock_unconfirmed.svg
diff --git a/sflphone-client-gnome/pixmaps/mailbox.svg b/gnome/pixmaps/mailbox.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/mailbox.svg
rename to gnome/pixmaps/mailbox.svg
diff --git a/sflphone-client-gnome/pixmaps/mic.svg b/gnome/pixmaps/mic.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/mic.svg
rename to gnome/pixmaps/mic.svg
diff --git a/sflphone-client-gnome/pixmaps/mic_25.svg b/gnome/pixmaps/mic_25.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/mic_25.svg
rename to gnome/pixmaps/mic_25.svg
diff --git a/sflphone-client-gnome/pixmaps/mic_50.svg b/gnome/pixmaps/mic_50.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/mic_50.svg
rename to gnome/pixmaps/mic_50.svg
diff --git a/sflphone-client-gnome/pixmaps/mic_75.svg b/gnome/pixmaps/mic_75.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/mic_75.svg
rename to gnome/pixmaps/mic_75.svg
diff --git a/sflphone-client-gnome/pixmaps/missed.svg b/gnome/pixmaps/missed.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/missed.svg
rename to gnome/pixmaps/missed.svg
diff --git a/sflphone-client-gnome/pixmaps/outgoing.svg b/gnome/pixmaps/outgoing.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/outgoing.svg
rename to gnome/pixmaps/outgoing.svg
diff --git a/sflphone-client-gnome/pixmaps/phone.svg b/gnome/pixmaps/phone.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/phone.svg
rename to gnome/pixmaps/phone.svg
diff --git a/sflphone-client-gnome/pixmaps/rec_call.svg b/gnome/pixmaps/rec_call.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/rec_call.svg
rename to gnome/pixmaps/rec_call.svg
diff --git a/sflphone-client-gnome/pixmaps/refuse.svg b/gnome/pixmaps/refuse.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/refuse.svg
rename to gnome/pixmaps/refuse.svg
diff --git a/sflphone-client-gnome/pixmaps/ring.svg b/gnome/pixmaps/ring.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/ring.svg
rename to gnome/pixmaps/ring.svg
diff --git a/sflphone-client-gnome/pixmaps/sflphone.svg b/gnome/pixmaps/sflphone.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/sflphone.svg
rename to gnome/pixmaps/sflphone.svg
diff --git a/sflphone-client-gnome/pixmaps/sflphone_notif.svg b/gnome/pixmaps/sflphone_notif.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/sflphone_notif.svg
rename to gnome/pixmaps/sflphone_notif.svg
diff --git a/sflphone-client-gnome/pixmaps/sflphone_offline.svg b/gnome/pixmaps/sflphone_offline.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/sflphone_offline.svg
rename to gnome/pixmaps/sflphone_offline.svg
diff --git a/sflphone-client-gnome/pixmaps/sflphone_small.svg b/gnome/pixmaps/sflphone_small.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/sflphone_small.svg
rename to gnome/pixmaps/sflphone_small.svg
diff --git a/sflphone-client-gnome/pixmaps/speaker.svg b/gnome/pixmaps/speaker.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/speaker.svg
rename to gnome/pixmaps/speaker.svg
diff --git a/sflphone-client-gnome/pixmaps/speaker_25.svg b/gnome/pixmaps/speaker_25.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/speaker_25.svg
rename to gnome/pixmaps/speaker_25.svg
diff --git a/sflphone-client-gnome/pixmaps/speaker_50.svg b/gnome/pixmaps/speaker_50.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/speaker_50.svg
rename to gnome/pixmaps/speaker_50.svg
diff --git a/sflphone-client-gnome/pixmaps/speaker_75.svg b/gnome/pixmaps/speaker_75.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/speaker_75.svg
rename to gnome/pixmaps/speaker_75.svg
diff --git a/sflphone-client-gnome/pixmaps/stock_person.svg b/gnome/pixmaps/stock_person.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/stock_person.svg
rename to gnome/pixmaps/stock_person.svg
diff --git a/sflphone-client-gnome/pixmaps/transfert.svg b/gnome/pixmaps/transfert.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/transfert.svg
rename to gnome/pixmaps/transfert.svg
diff --git a/sflphone-client-gnome/pixmaps/unhold.svg b/gnome/pixmaps/unhold.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/unhold.svg
rename to gnome/pixmaps/unhold.svg
diff --git a/sflphone-client-gnome/pixmaps/users.svg b/gnome/pixmaps/users.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/users.svg
rename to gnome/pixmaps/users.svg
diff --git a/sflphone-client-gnome/pixmaps/usersAttached.svg b/gnome/pixmaps/usersAttached.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/usersAttached.svg
rename to gnome/pixmaps/usersAttached.svg
diff --git a/sflphone-client-gnome/pixmaps/usersAttachedRec.svg b/gnome/pixmaps/usersAttachedRec.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/usersAttachedRec.svg
rename to gnome/pixmaps/usersAttachedRec.svg
diff --git a/sflphone-client-gnome/pixmaps/usersDetached.svg b/gnome/pixmaps/usersDetached.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/usersDetached.svg
rename to gnome/pixmaps/usersDetached.svg
diff --git a/sflphone-client-gnome/pixmaps/usersDetachedRec.svg b/gnome/pixmaps/usersDetachedRec.svg
similarity index 100%
rename from sflphone-client-gnome/pixmaps/usersDetachedRec.svg
rename to gnome/pixmaps/usersDetachedRec.svg
diff --git a/sflphone-client-gnome/pixmaps/wait-on.gif b/gnome/pixmaps/wait-on.gif
similarity index 100%
rename from sflphone-client-gnome/pixmaps/wait-on.gif
rename to gnome/pixmaps/wait-on.gif
diff --git a/sflphone-client-gnome/po/Makefile.am b/gnome/po/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/po/Makefile.am
rename to gnome/po/Makefile.am
diff --git a/sflphone-client-gnome/po/README b/gnome/po/README
similarity index 100%
rename from sflphone-client-gnome/po/README
rename to gnome/po/README
diff --git a/sflphone-client-gnome/po/da/da.po b/gnome/po/da/da.po
similarity index 100%
rename from sflphone-client-gnome/po/da/da.po
rename to gnome/po/da/da.po
diff --git a/sflphone-client-gnome/po/de/de.po b/gnome/po/de/de.po
similarity index 100%
rename from sflphone-client-gnome/po/de/de.po
rename to gnome/po/de/de.po
diff --git a/sflphone-client-gnome/po/es/es.po b/gnome/po/es/es.po
similarity index 100%
rename from sflphone-client-gnome/po/es/es.po
rename to gnome/po/es/es.po
diff --git a/sflphone-client-gnome/po/fr/fr.po b/gnome/po/fr/fr.po
similarity index 100%
rename from sflphone-client-gnome/po/fr/fr.po
rename to gnome/po/fr/fr.po
diff --git a/sflphone-client-gnome/po/it/it.po b/gnome/po/it/it.po
similarity index 100%
rename from sflphone-client-gnome/po/it/it.po
rename to gnome/po/it/it.po
diff --git a/sflphone-client-gnome/po/pt_BR/pt_BR.po b/gnome/po/pt_BR/pt_BR.po
similarity index 100%
rename from sflphone-client-gnome/po/pt_BR/pt_BR.po
rename to gnome/po/pt_BR/pt_BR.po
diff --git a/sflphone-client-gnome/po/ru/ru.po b/gnome/po/ru/ru.po
similarity index 100%
rename from sflphone-client-gnome/po/ru/ru.po
rename to gnome/po/ru/ru.po
diff --git a/sflphone-client-gnome/po/zh_CN/zh_CN.po b/gnome/po/zh_CN/zh_CN.po
similarity index 100%
rename from sflphone-client-gnome/po/zh_CN/zh_CN.po
rename to gnome/po/zh_CN/zh_CN.po
diff --git a/sflphone-client-gnome/po/zh_HK/zh_HK.po b/gnome/po/zh_HK/zh_HK.po
similarity index 100%
rename from sflphone-client-gnome/po/zh_HK/zh_HK.po
rename to gnome/po/zh_HK/zh_HK.po
diff --git a/sflphone-client-gnome/sflphone-client-gnome.schemas b/gnome/sflphone-client-gnome.schemas
similarity index 100%
rename from sflphone-client-gnome/sflphone-client-gnome.schemas
rename to gnome/sflphone-client-gnome.schemas
diff --git a/sflphone-client-gnome/sflphone.desktop.in b/gnome/sflphone.desktop.in
similarity index 100%
rename from sflphone-client-gnome/sflphone.desktop.in
rename to gnome/sflphone.desktop.in
diff --git a/sflphone-client-gnome/src/Makefile.am b/gnome/src/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/Makefile.am
rename to gnome/src/Makefile.am
diff --git a/sflphone-client-gnome/src/accountlist.c b/gnome/src/accountlist.c
similarity index 100%
rename from sflphone-client-gnome/src/accountlist.c
rename to gnome/src/accountlist.c
diff --git a/sflphone-client-gnome/src/accountlist.h b/gnome/src/accountlist.h
similarity index 100%
rename from sflphone-client-gnome/src/accountlist.h
rename to gnome/src/accountlist.h
diff --git a/sflphone-client-gnome/src/actions.c b/gnome/src/actions.c
similarity index 100%
rename from sflphone-client-gnome/src/actions.c
rename to gnome/src/actions.c
diff --git a/sflphone-client-gnome/src/actions.h b/gnome/src/actions.h
similarity index 100%
rename from sflphone-client-gnome/src/actions.h
rename to gnome/src/actions.h
diff --git a/sflphone-client-gnome/src/callable_obj.c b/gnome/src/callable_obj.c
similarity index 100%
rename from sflphone-client-gnome/src/callable_obj.c
rename to gnome/src/callable_obj.c
diff --git a/sflphone-client-gnome/src/callable_obj.h b/gnome/src/callable_obj.h
similarity index 100%
rename from sflphone-client-gnome/src/callable_obj.h
rename to gnome/src/callable_obj.h
diff --git a/sflphone-client-gnome/src/codeclist.c b/gnome/src/codeclist.c
similarity index 100%
rename from sflphone-client-gnome/src/codeclist.c
rename to gnome/src/codeclist.c
diff --git a/sflphone-client-gnome/src/codeclist.h b/gnome/src/codeclist.h
similarity index 100%
rename from sflphone-client-gnome/src/codeclist.h
rename to gnome/src/codeclist.h
diff --git a/sflphone-client-gnome/src/conference_obj.c b/gnome/src/conference_obj.c
similarity index 100%
rename from sflphone-client-gnome/src/conference_obj.c
rename to gnome/src/conference_obj.c
diff --git a/sflphone-client-gnome/src/conference_obj.h b/gnome/src/conference_obj.h
similarity index 100%
rename from sflphone-client-gnome/src/conference_obj.h
rename to gnome/src/conference_obj.h
diff --git a/sflphone-client-gnome/src/config/Makefile.am b/gnome/src/config/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/config/Makefile.am
rename to gnome/src/config/Makefile.am
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
similarity index 100%
rename from sflphone-client-gnome/src/config/accountconfigdialog.c
rename to gnome/src/config/accountconfigdialog.c
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.h b/gnome/src/config/accountconfigdialog.h
similarity index 100%
rename from sflphone-client-gnome/src/config/accountconfigdialog.h
rename to gnome/src/config/accountconfigdialog.h
diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c
similarity index 100%
rename from sflphone-client-gnome/src/config/accountlistconfigdialog.c
rename to gnome/src/config/accountlistconfigdialog.c
diff --git a/sflphone-client-gnome/src/config/accountlistconfigdialog.h b/gnome/src/config/accountlistconfigdialog.h
similarity index 100%
rename from sflphone-client-gnome/src/config/accountlistconfigdialog.h
rename to gnome/src/config/accountlistconfigdialog.h
diff --git a/sflphone-client-gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c
similarity index 100%
rename from sflphone-client-gnome/src/config/addressbook-config.c
rename to gnome/src/config/addressbook-config.c
diff --git a/sflphone-client-gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h
similarity index 100%
rename from sflphone-client-gnome/src/config/addressbook-config.h
rename to gnome/src/config/addressbook-config.h
diff --git a/sflphone-client-gnome/src/config/assistant.c b/gnome/src/config/assistant.c
similarity index 100%
rename from sflphone-client-gnome/src/config/assistant.c
rename to gnome/src/config/assistant.c
diff --git a/sflphone-client-gnome/src/config/assistant.h b/gnome/src/config/assistant.h
similarity index 100%
rename from sflphone-client-gnome/src/config/assistant.h
rename to gnome/src/config/assistant.h
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/gnome/src/config/audioconf.c
similarity index 100%
rename from sflphone-client-gnome/src/config/audioconf.c
rename to gnome/src/config/audioconf.c
diff --git a/sflphone-client-gnome/src/config/audioconf.h b/gnome/src/config/audioconf.h
similarity index 100%
rename from sflphone-client-gnome/src/config/audioconf.h
rename to gnome/src/config/audioconf.h
diff --git a/sflphone-client-gnome/src/config/hooks-config.c b/gnome/src/config/hooks-config.c
similarity index 100%
rename from sflphone-client-gnome/src/config/hooks-config.c
rename to gnome/src/config/hooks-config.c
diff --git a/sflphone-client-gnome/src/config/hooks-config.h b/gnome/src/config/hooks-config.h
similarity index 100%
rename from sflphone-client-gnome/src/config/hooks-config.h
rename to gnome/src/config/hooks-config.h
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/gnome/src/config/preferencesdialog.c
similarity index 100%
rename from sflphone-client-gnome/src/config/preferencesdialog.c
rename to gnome/src/config/preferencesdialog.c
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.h b/gnome/src/config/preferencesdialog.h
similarity index 100%
rename from sflphone-client-gnome/src/config/preferencesdialog.h
rename to gnome/src/config/preferencesdialog.h
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.c b/gnome/src/config/shortcuts-config.c
similarity index 100%
rename from sflphone-client-gnome/src/config/shortcuts-config.c
rename to gnome/src/config/shortcuts-config.c
diff --git a/sflphone-client-gnome/src/config/shortcuts-config.h b/gnome/src/config/shortcuts-config.h
similarity index 100%
rename from sflphone-client-gnome/src/config/shortcuts-config.h
rename to gnome/src/config/shortcuts-config.h
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.c b/gnome/src/config/tlsadvanceddialog.c
similarity index 100%
rename from sflphone-client-gnome/src/config/tlsadvanceddialog.c
rename to gnome/src/config/tlsadvanceddialog.c
diff --git a/sflphone-client-gnome/src/config/tlsadvanceddialog.h b/gnome/src/config/tlsadvanceddialog.h
similarity index 100%
rename from sflphone-client-gnome/src/config/tlsadvanceddialog.h
rename to gnome/src/config/tlsadvanceddialog.h
diff --git a/sflphone-client-gnome/src/config/utils.c b/gnome/src/config/utils.c
similarity index 100%
rename from sflphone-client-gnome/src/config/utils.c
rename to gnome/src/config/utils.c
diff --git a/sflphone-client-gnome/src/config/utils.h b/gnome/src/config/utils.h
similarity index 100%
rename from sflphone-client-gnome/src/config/utils.h
rename to gnome/src/config/utils.h
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.c b/gnome/src/config/zrtpadvanceddialog.c
similarity index 100%
rename from sflphone-client-gnome/src/config/zrtpadvanceddialog.c
rename to gnome/src/config/zrtpadvanceddialog.c
diff --git a/sflphone-client-gnome/src/config/zrtpadvanceddialog.h b/gnome/src/config/zrtpadvanceddialog.h
similarity index 100%
rename from sflphone-client-gnome/src/config/zrtpadvanceddialog.h
rename to gnome/src/config/zrtpadvanceddialog.h
diff --git a/sflphone-client-gnome/src/contacts/Makefile.am b/gnome/src/contacts/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/contacts/Makefile.am
rename to gnome/src/contacts/Makefile.am
diff --git a/sflphone-client-gnome/src/contacts/addrbookfactory.c b/gnome/src/contacts/addrbookfactory.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/addrbookfactory.c
rename to gnome/src/contacts/addrbookfactory.c
diff --git a/sflphone-client-gnome/src/contacts/addrbookfactory.h b/gnome/src/contacts/addrbookfactory.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/addrbookfactory.h
rename to gnome/src/contacts/addrbookfactory.h
diff --git a/sflphone-client-gnome/src/contacts/addressbook.h b/gnome/src/contacts/addressbook.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/addressbook.h
rename to gnome/src/contacts/addressbook.h
diff --git a/sflphone-client-gnome/src/contacts/calllist.c b/gnome/src/contacts/calllist.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calllist.c
rename to gnome/src/contacts/calllist.c
diff --git a/sflphone-client-gnome/src/contacts/calllist.h b/gnome/src/contacts/calllist.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calllist.h
rename to gnome/src/contacts/calllist.h
diff --git a/sflphone-client-gnome/src/contacts/calltab.c b/gnome/src/contacts/calltab.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calltab.c
rename to gnome/src/contacts/calltab.c
diff --git a/sflphone-client-gnome/src/contacts/calltab.h b/gnome/src/contacts/calltab.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calltab.h
rename to gnome/src/contacts/calltab.h
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calltree.c
rename to gnome/src/contacts/calltree.c
diff --git a/sflphone-client-gnome/src/contacts/calltree.h b/gnome/src/contacts/calltree.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/calltree.h
rename to gnome/src/contacts/calltree.h
diff --git a/sflphone-client-gnome/src/contacts/conferencelist.c b/gnome/src/contacts/conferencelist.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/conferencelist.c
rename to gnome/src/contacts/conferencelist.c
diff --git a/sflphone-client-gnome/src/contacts/conferencelist.h b/gnome/src/contacts/conferencelist.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/conferencelist.h
rename to gnome/src/contacts/conferencelist.h
diff --git a/sflphone-client-gnome/src/contacts/history.c b/gnome/src/contacts/history.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/history.c
rename to gnome/src/contacts/history.c
diff --git a/sflphone-client-gnome/src/contacts/history.h b/gnome/src/contacts/history.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/history.h
rename to gnome/src/contacts/history.h
diff --git a/sflphone-client-gnome/src/contacts/searchbar.c b/gnome/src/contacts/searchbar.c
similarity index 100%
rename from sflphone-client-gnome/src/contacts/searchbar.c
rename to gnome/src/contacts/searchbar.c
diff --git a/sflphone-client-gnome/src/contacts/searchbar.h b/gnome/src/contacts/searchbar.h
similarity index 100%
rename from sflphone-client-gnome/src/contacts/searchbar.h
rename to gnome/src/contacts/searchbar.h
diff --git a/sflphone-client-gnome/src/dbus/Makefile.am b/gnome/src/dbus/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/dbus/Makefile.am
rename to gnome/src/dbus/Makefile.am
diff --git a/sflphone-client-gnome/src/dbus/README b/gnome/src/dbus/README
similarity index 100%
rename from sflphone-client-gnome/src/dbus/README
rename to gnome/src/dbus/README
diff --git a/sflphone-common/src/dbus/callmanager-introspec.xml b/gnome/src/dbus/callmanager-introspec.xml
similarity index 100%
rename from sflphone-common/src/dbus/callmanager-introspec.xml
rename to gnome/src/dbus/callmanager-introspec.xml
diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/gnome/src/dbus/configurationmanager-introspec.xml
similarity index 100%
rename from sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
rename to gnome/src/dbus/configurationmanager-introspec.xml
diff --git a/sflphone-common/src/dbus/contactmanager-introspec.xml b/gnome/src/dbus/contactmanager-introspec.xml
similarity index 100%
rename from sflphone-common/src/dbus/contactmanager-introspec.xml
rename to gnome/src/dbus/contactmanager-introspec.xml
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
similarity index 100%
rename from sflphone-client-gnome/src/dbus/dbus.c
rename to gnome/src/dbus/dbus.c
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/gnome/src/dbus/dbus.h
similarity index 100%
rename from sflphone-client-gnome/src/dbus/dbus.h
rename to gnome/src/dbus/dbus.h
diff --git a/sflphone-client-kde/src/dbus/instance-introspec.xml b/gnome/src/dbus/instance-introspec.xml
similarity index 100%
rename from sflphone-client-kde/src/dbus/instance-introspec.xml
rename to gnome/src/dbus/instance-introspec.xml
diff --git a/sflphone-client-gnome/src/dbus/marshaller.list b/gnome/src/dbus/marshaller.list
similarity index 100%
rename from sflphone-client-gnome/src/dbus/marshaller.list
rename to gnome/src/dbus/marshaller.list
diff --git a/sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml b/gnome/src/dbus/shortcutsmanager-introspec.xml
similarity index 100%
rename from sflphone-client-gnome/src/dbus/shortcutsmanager-introspec.xml
rename to gnome/src/dbus/shortcutsmanager-introspec.xml
diff --git a/sflphone-client-gnome/src/dialpad.c b/gnome/src/dialpad.c
similarity index 100%
rename from sflphone-client-gnome/src/dialpad.c
rename to gnome/src/dialpad.c
diff --git a/sflphone-client-gnome/src/dialpad.h b/gnome/src/dialpad.h
similarity index 100%
rename from sflphone-client-gnome/src/dialpad.h
rename to gnome/src/dialpad.h
diff --git a/sflphone-client-gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c
similarity index 100%
rename from sflphone-client-gnome/src/eel-gconf-extensions.c
rename to gnome/src/eel-gconf-extensions.c
diff --git a/sflphone-client-gnome/src/eel-gconf-extensions.h b/gnome/src/eel-gconf-extensions.h
similarity index 100%
rename from sflphone-client-gnome/src/eel-gconf-extensions.h
rename to gnome/src/eel-gconf-extensions.h
diff --git a/sflphone-client-gnome/src/errors.c b/gnome/src/errors.c
similarity index 100%
rename from sflphone-client-gnome/src/errors.c
rename to gnome/src/errors.c
diff --git a/sflphone-client-gnome/src/errors.h b/gnome/src/errors.h
similarity index 100%
rename from sflphone-client-gnome/src/errors.h
rename to gnome/src/errors.h
diff --git a/sflphone-client-gnome/src/icons/Makefile.am b/gnome/src/icons/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/icons/Makefile.am
rename to gnome/src/icons/Makefile.am
diff --git a/sflphone-client-gnome/src/icons/README b/gnome/src/icons/README
similarity index 100%
rename from sflphone-client-gnome/src/icons/README
rename to gnome/src/icons/README
diff --git a/sflphone-client-gnome/src/icons/icon_factory.c b/gnome/src/icons/icon_factory.c
similarity index 100%
rename from sflphone-client-gnome/src/icons/icon_factory.c
rename to gnome/src/icons/icon_factory.c
diff --git a/sflphone-client-gnome/src/icons/icon_factory.h b/gnome/src/icons/icon_factory.h
similarity index 100%
rename from sflphone-client-gnome/src/icons/icon_factory.h
rename to gnome/src/icons/icon_factory.h
diff --git a/sflphone-client-gnome/src/icons/pixmap_data.h b/gnome/src/icons/pixmap_data.h
similarity index 100%
rename from sflphone-client-gnome/src/icons/pixmap_data.h
rename to gnome/src/icons/pixmap_data.h
diff --git a/sflphone-client-gnome/src/imwindow.c b/gnome/src/imwindow.c
similarity index 100%
rename from sflphone-client-gnome/src/imwindow.c
rename to gnome/src/imwindow.c
diff --git a/sflphone-client-gnome/src/imwindow.h b/gnome/src/imwindow.h
similarity index 100%
rename from sflphone-client-gnome/src/imwindow.h
rename to gnome/src/imwindow.h
diff --git a/sflphone-client-gnome/src/logger.c b/gnome/src/logger.c
similarity index 100%
rename from sflphone-client-gnome/src/logger.c
rename to gnome/src/logger.c
diff --git a/sflphone-client-gnome/src/logger.h b/gnome/src/logger.h
similarity index 100%
rename from sflphone-client-gnome/src/logger.h
rename to gnome/src/logger.h
diff --git a/sflphone-client-gnome/src/main.c b/gnome/src/main.c
similarity index 100%
rename from sflphone-client-gnome/src/main.c
rename to gnome/src/main.c
diff --git a/sflphone-client-gnome/src/mainwindow.c b/gnome/src/mainwindow.c
similarity index 100%
rename from sflphone-client-gnome/src/mainwindow.c
rename to gnome/src/mainwindow.c
diff --git a/sflphone-client-gnome/src/mainwindow.h b/gnome/src/mainwindow.h
similarity index 100%
rename from sflphone-client-gnome/src/mainwindow.h
rename to gnome/src/mainwindow.h
diff --git a/sflphone-client-gnome/src/reqaccount.c b/gnome/src/reqaccount.c
similarity index 100%
rename from sflphone-client-gnome/src/reqaccount.c
rename to gnome/src/reqaccount.c
diff --git a/sflphone-client-gnome/src/reqaccount.h b/gnome/src/reqaccount.h
similarity index 100%
rename from sflphone-client-gnome/src/reqaccount.h
rename to gnome/src/reqaccount.h
diff --git a/sflphone-client-gnome/src/sflnotify.c b/gnome/src/sflnotify.c
similarity index 100%
rename from sflphone-client-gnome/src/sflnotify.c
rename to gnome/src/sflnotify.c
diff --git a/sflphone-client-gnome/src/sflnotify.h b/gnome/src/sflnotify.h
similarity index 100%
rename from sflphone-client-gnome/src/sflnotify.h
rename to gnome/src/sflnotify.h
diff --git a/sflphone-client-gnome/src/sflphone_const.h b/gnome/src/sflphone_const.h
similarity index 100%
rename from sflphone-client-gnome/src/sflphone_const.h
rename to gnome/src/sflphone_const.h
diff --git a/sflphone-client-gnome/src/shortcuts.c b/gnome/src/shortcuts.c
similarity index 100%
rename from sflphone-client-gnome/src/shortcuts.c
rename to gnome/src/shortcuts.c
diff --git a/sflphone-client-gnome/src/shortcuts.h b/gnome/src/shortcuts.h
similarity index 100%
rename from sflphone-client-gnome/src/shortcuts.h
rename to gnome/src/shortcuts.h
diff --git a/sflphone-client-gnome/src/sliders.c b/gnome/src/sliders.c
similarity index 100%
rename from sflphone-client-gnome/src/sliders.c
rename to gnome/src/sliders.c
diff --git a/sflphone-client-gnome/src/sliders.h b/gnome/src/sliders.h
similarity index 100%
rename from sflphone-client-gnome/src/sliders.h
rename to gnome/src/sliders.h
diff --git a/sflphone-client-gnome/src/statusicon.c b/gnome/src/statusicon.c
similarity index 100%
rename from sflphone-client-gnome/src/statusicon.c
rename to gnome/src/statusicon.c
diff --git a/sflphone-client-gnome/src/statusicon.h b/gnome/src/statusicon.h
similarity index 100%
rename from sflphone-client-gnome/src/statusicon.h
rename to gnome/src/statusicon.h
diff --git a/sflphone-client-gnome/src/toolbar.c b/gnome/src/toolbar.c
similarity index 100%
rename from sflphone-client-gnome/src/toolbar.c
rename to gnome/src/toolbar.c
diff --git a/sflphone-client-gnome/src/toolbar.h b/gnome/src/toolbar.h
similarity index 100%
rename from sflphone-client-gnome/src/toolbar.h
rename to gnome/src/toolbar.h
diff --git a/sflphone-client-gnome/src/ui.xml b/gnome/src/ui.xml
similarity index 100%
rename from sflphone-client-gnome/src/ui.xml
rename to gnome/src/ui.xml
diff --git a/sflphone-client-gnome/src/uimanager.c b/gnome/src/uimanager.c
similarity index 100%
rename from sflphone-client-gnome/src/uimanager.c
rename to gnome/src/uimanager.c
diff --git a/sflphone-client-gnome/src/uimanager.h b/gnome/src/uimanager.h
similarity index 100%
rename from sflphone-client-gnome/src/uimanager.h
rename to gnome/src/uimanager.h
diff --git a/sflphone-client-gnome/src/widget/Makefile.am b/gnome/src/widget/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/src/widget/Makefile.am
rename to gnome/src/widget/Makefile.am
diff --git a/sflphone-client-gnome/src/widget/gtkscrollbook.c b/gnome/src/widget/gtkscrollbook.c
similarity index 100%
rename from sflphone-client-gnome/src/widget/gtkscrollbook.c
rename to gnome/src/widget/gtkscrollbook.c
diff --git a/sflphone-client-gnome/src/widget/gtkscrollbook.h b/gnome/src/widget/gtkscrollbook.h
similarity index 100%
rename from sflphone-client-gnome/src/widget/gtkscrollbook.h
rename to gnome/src/widget/gtkscrollbook.h
diff --git a/sflphone-client-gnome/src/widget/imwidget.c b/gnome/src/widget/imwidget.c
similarity index 100%
rename from sflphone-client-gnome/src/widget/imwidget.c
rename to gnome/src/widget/imwidget.c
diff --git a/sflphone-client-gnome/src/widget/imwidget.h b/gnome/src/widget/imwidget.h
similarity index 100%
rename from sflphone-client-gnome/src/widget/imwidget.h
rename to gnome/src/widget/imwidget.h
diff --git a/sflphone-client-gnome/src/widget/minidialog.c b/gnome/src/widget/minidialog.c
similarity index 100%
rename from sflphone-client-gnome/src/widget/minidialog.c
rename to gnome/src/widget/minidialog.c
diff --git a/sflphone-client-gnome/src/widget/minidialog.h b/gnome/src/widget/minidialog.h
similarity index 100%
rename from sflphone-client-gnome/src/widget/minidialog.h
rename to gnome/src/widget/minidialog.h
diff --git a/sflphone-client-gnome/stamp-h.in b/gnome/stamp-h.in
similarity index 100%
rename from sflphone-client-gnome/stamp-h.in
rename to gnome/stamp-h.in
diff --git a/sflphone-client-gnome/tests/Makefile.am b/gnome/tests/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/tests/Makefile.am
rename to gnome/tests/Makefile.am
diff --git a/sflphone-client-gnome/tests/check_config.c b/gnome/tests/check_config.c
similarity index 100%
rename from sflphone-client-gnome/tests/check_config.c
rename to gnome/tests/check_config.c
diff --git a/sflphone-client-gnome/tests/check_contacts.c b/gnome/tests/check_contacts.c
similarity index 100%
rename from sflphone-client-gnome/tests/check_contacts.c
rename to gnome/tests/check_contacts.c
diff --git a/sflphone-client-gnome/tests/check_dbus.c b/gnome/tests/check_dbus.c
similarity index 100%
rename from sflphone-client-gnome/tests/check_dbus.c
rename to gnome/tests/check_dbus.c
diff --git a/sflphone-client-gnome/tests/check_global.c b/gnome/tests/check_global.c
similarity index 100%
rename from sflphone-client-gnome/tests/check_global.c
rename to gnome/tests/check_global.c
diff --git a/sflphone-client-gnome/webkit/Makefile.am b/gnome/webkit/Makefile.am
similarity index 100%
rename from sflphone-client-gnome/webkit/Makefile.am
rename to gnome/webkit/Makefile.am
diff --git a/sflphone-client-gnome/webkit/im/chat_info.png b/gnome/webkit/im/chat_info.png
similarity index 100%
rename from sflphone-client-gnome/webkit/im/chat_info.png
rename to gnome/webkit/im/chat_info.png
diff --git a/sflphone-client-gnome/webkit/im/error.png b/gnome/webkit/im/error.png
similarity index 100%
rename from sflphone-client-gnome/webkit/im/error.png
rename to gnome/webkit/im/error.png
diff --git a/sflphone-client-gnome/webkit/im/im.css b/gnome/webkit/im/im.css
similarity index 100%
rename from sflphone-client-gnome/webkit/im/im.css
rename to gnome/webkit/im/im.css
diff --git a/sflphone-client-gnome/webkit/im/im.html b/gnome/webkit/im/im.html
similarity index 100%
rename from sflphone-client-gnome/webkit/im/im.html
rename to gnome/webkit/im/im.html
diff --git a/sflphone-client-gnome/webkit/im/im.js b/gnome/webkit/im/im.js
similarity index 100%
rename from sflphone-client-gnome/webkit/im/im.js
rename to gnome/webkit/im/im.js
diff --git a/sflphone-client-gnome/webkit/im/sflphone.png b/gnome/webkit/im/sflphone.png
similarity index 100%
rename from sflphone-client-gnome/webkit/im/sflphone.png
rename to gnome/webkit/im/sflphone.png
diff --git a/hudson-sflphone-script.sh b/hudson-sflphone-script.sh
index 875a3c93d2bb3190547a8221afe117d5e54b3aa4..e083be6494095173285c95353b6fd5e21edcf453 100755
--- a/hudson-sflphone-script.sh
+++ b/hudson-sflphone-script.sh
@@ -7,9 +7,9 @@
XML_RESULTS="cppunitresults.xml"
set -x
-
+
# Compile the daemon
-pushd sflphone-common
+pushd daemon
./autogen.sh
# Compile pjproject first
pushd libs/pjproject
@@ -24,14 +24,14 @@ make doc
popd
# Run the unit tests for the daemon
-pushd sflphone-common/test
+pushd daemon/test
# Remove the previous XML test file
rm -rf $XML_RESULTS
make check || exit 1
popd
# Compile the client
-pushd sflphone-client-gnome
+pushd gnome
./autogen.sh
./configure --prefix=/usr
make clean
diff --git a/sflphone-client-kde/AUTHORS b/kde/AUTHORS
similarity index 100%
rename from sflphone-client-kde/AUTHORS
rename to kde/AUTHORS
diff --git a/sflphone-client-kde/CMakeLists.txt b/kde/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/CMakeLists.txt
rename to kde/CMakeLists.txt
diff --git a/sflphone-client-kde/COPYING b/kde/COPYING
similarity index 100%
rename from sflphone-client-kde/COPYING
rename to kde/COPYING
diff --git a/sflphone-client-kde/ChangeLog b/kde/ChangeLog
similarity index 100%
rename from sflphone-client-kde/ChangeLog
rename to kde/ChangeLog
diff --git a/sflphone-client-kde/DEVELOPPER b/kde/DEVELOPPER
similarity index 100%
rename from sflphone-client-kde/DEVELOPPER
rename to kde/DEVELOPPER
diff --git a/sflphone-client-kde/Doxyfile b/kde/Doxyfile
similarity index 100%
rename from sflphone-client-kde/Doxyfile
rename to kde/Doxyfile
diff --git a/sflphone-client-kde/INSTALL b/kde/INSTALL
similarity index 100%
rename from sflphone-client-kde/INSTALL
rename to kde/INSTALL
diff --git a/sflphone-client-kde/NEWS b/kde/NEWS
similarity index 100%
rename from sflphone-client-kde/NEWS
rename to kde/NEWS
diff --git a/sflphone-client-kde/README b/kde/README
similarity index 100%
rename from sflphone-client-kde/README
rename to kde/README
diff --git a/sflphone-client-kde/VERSION b/kde/VERSION
similarity index 100%
rename from sflphone-client-kde/VERSION
rename to kde/VERSION
diff --git a/sflphone-client-kde/cmake-build/CMakeCache.txt b/kde/cmake-build/CMakeCache.txt
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeCache.txt
rename to kde/cmake-build/CMakeCache.txt
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeCCompiler.cmake b/kde/cmake-build/CMakeFiles/CMakeCCompiler.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeCCompiler.cmake
rename to kde/cmake-build/CMakeFiles/CMakeCCompiler.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeCXXCompiler.cmake b/kde/cmake-build/CMakeFiles/CMakeCXXCompiler.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeCXXCompiler.cmake
rename to kde/cmake-build/CMakeFiles/CMakeCXXCompiler.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_C.bin b/kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_C.bin
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_C.bin
rename to kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_C.bin
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin b/kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
rename to kde/cmake-build/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeError.log b/kde/cmake-build/CMakeFiles/CMakeError.log
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeError.log
rename to kde/cmake-build/CMakeFiles/CMakeError.log
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeOutput.log b/kde/cmake-build/CMakeFiles/CMakeOutput.log
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeOutput.log
rename to kde/cmake-build/CMakeFiles/CMakeOutput.log
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeRuleHashes.txt b/kde/cmake-build/CMakeFiles/CMakeRuleHashes.txt
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeRuleHashes.txt
rename to kde/cmake-build/CMakeFiles/CMakeRuleHashes.txt
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CMakeSystem.cmake b/kde/cmake-build/CMakeFiles/CMakeSystem.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CMakeSystem.cmake
rename to kde/cmake-build/CMakeFiles/CMakeSystem.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c b/kde/cmake-build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
rename to kde/cmake-build/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdC/a.out b/kde/cmake-build/CMakeFiles/CompilerIdC/a.out
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdC/a.out
rename to kde/cmake-build/CMakeFiles/CompilerIdC/a.out
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp b/kde/cmake-build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
rename to kde/cmake-build/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdCXX/a.out b/kde/cmake-build/CMakeFiles/CompilerIdCXX/a.out
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/CompilerIdCXX/a.out
rename to kde/cmake-build/CMakeFiles/CompilerIdCXX/a.out
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/Makefile.cmake b/kde/cmake-build/CMakeFiles/Makefile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/Makefile.cmake
rename to kde/cmake-build/CMakeFiles/Makefile.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/Makefile2 b/kde/cmake-build/CMakeFiles/Makefile2
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/Makefile2
rename to kde/cmake-build/CMakeFiles/Makefile2
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/TargetDirectories.txt b/kde/cmake-build/CMakeFiles/TargetDirectories.txt
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/TargetDirectories.txt
rename to kde/cmake-build/CMakeFiles/TargetDirectories.txt
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/cmake.check_cache b/kde/cmake-build/CMakeFiles/cmake.check_cache
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/cmake.check_cache
rename to kde/cmake-build/CMakeFiles/cmake.check_cache
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/DependInfo.cmake b/kde/cmake-build/CMakeFiles/distclean.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/DependInfo.cmake
rename to kde/cmake-build/CMakeFiles/distclean.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/build.make b/kde/cmake-build/CMakeFiles/distclean.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/build.make
rename to kde/cmake-build/CMakeFiles/distclean.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/cmake_clean.cmake b/kde/cmake-build/CMakeFiles/distclean.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/cmake_clean.cmake
rename to kde/cmake-build/CMakeFiles/distclean.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/progress.make b/kde/cmake-build/CMakeFiles/distclean.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/distclean.dir/progress.make
rename to kde/cmake-build/CMakeFiles/distclean.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/progress.marks b/kde/cmake-build/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/progress.marks
rename to kde/cmake-build/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/DependInfo.cmake b/kde/cmake-build/CMakeFiles/uninstall.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/DependInfo.cmake
rename to kde/cmake-build/CMakeFiles/uninstall.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/build.make b/kde/cmake-build/CMakeFiles/uninstall.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/build.make
rename to kde/cmake-build/CMakeFiles/uninstall.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/cmake_clean.cmake b/kde/cmake-build/CMakeFiles/uninstall.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/cmake_clean.cmake
rename to kde/cmake-build/CMakeFiles/uninstall.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/progress.make b/kde/cmake-build/CMakeFiles/uninstall.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeFiles/uninstall.dir/progress.make
rename to kde/cmake-build/CMakeFiles/uninstall.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/CMakeTmp/check_qt_visibility.cpp b/kde/cmake-build/CMakeTmp/check_qt_visibility.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/CMakeTmp/check_qt_visibility.cpp
rename to kde/cmake-build/CMakeTmp/check_qt_visibility.cpp
diff --git a/sflphone-client-kde/cmake-build/CTestTestfile.cmake b/kde/cmake-build/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/CTestTestfile.cmake
rename to kde/cmake-build/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/Makefile b/kde/cmake-build/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/Makefile
rename to kde/cmake-build/Makefile
diff --git a/sflphone-client-kde/cmake-build/cmake_install.cmake b/kde/cmake-build/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/cmake_install.cmake
rename to kde/cmake-build/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/cmake_uninstall.cmake b/kde/cmake-build/cmake_uninstall.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/cmake_uninstall.cmake
rename to kde/cmake-build/cmake_uninstall.cmake
diff --git a/sflphone-client-kde/cmake-build/data/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/data/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/data/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/data/CMakeFiles/progress.marks b/kde/cmake-build/data/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/CMakeFiles/progress.marks
rename to kde/cmake-build/data/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/data/CTestTestfile.cmake b/kde/cmake-build/data/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/CTestTestfile.cmake
rename to kde/cmake-build/data/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/data/Makefile b/kde/cmake-build/data/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/Makefile
rename to kde/cmake-build/data/Makefile
diff --git a/sflphone-client-kde/cmake-build/data/cmake_install.cmake b/kde/cmake-build/data/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/cmake_install.cmake
rename to kde/cmake-build/data/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/data/icons/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/data/icons/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/icons/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/data/icons/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/data/icons/CMakeFiles/progress.marks b/kde/cmake-build/data/icons/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/icons/CMakeFiles/progress.marks
rename to kde/cmake-build/data/icons/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/data/icons/CTestTestfile.cmake b/kde/cmake-build/data/icons/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/icons/CTestTestfile.cmake
rename to kde/cmake-build/data/icons/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/data/icons/Makefile b/kde/cmake-build/data/icons/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/icons/Makefile
rename to kde/cmake-build/data/icons/Makefile
diff --git a/sflphone-client-kde/cmake-build/data/icons/cmake_install.cmake b/kde/cmake-build/data/icons/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/data/icons/cmake_install.cmake
rename to kde/cmake-build/data/icons/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/doc/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/doc/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/DependInfo.cmake b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/DependInfo.cmake
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/build.make b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/build.make
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/cmake_clean.cmake b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/cmake_clean.cmake
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.internal b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.internal
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.make b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.make
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/progress.make b/kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/progress.make
rename to kde/cmake-build/doc/CMakeFiles/doc-handbook.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/doc/CMakeFiles/progress.marks b/kde/cmake-build/doc/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CMakeFiles/progress.marks
rename to kde/cmake-build/doc/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/doc/CTestTestfile.cmake b/kde/cmake-build/doc/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/CTestTestfile.cmake
rename to kde/cmake-build/doc/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/Makefile b/kde/cmake-build/doc/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/Makefile
rename to kde/cmake-build/doc/Makefile
diff --git a/sflphone-client-kde/cmake-build/doc/cmake_install.cmake b/kde/cmake-build/doc/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/cmake_install.cmake
rename to kde/cmake-build/doc/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/doc/index.cache.bz2 b/kde/cmake-build/doc/index.cache.bz2
similarity index 100%
rename from sflphone-client-kde/cmake-build/doc/index.cache.bz2
rename to kde/cmake-build/doc/index.cache.bz2
diff --git a/sflphone-client-kde/cmake-build/install_manifest.txt b/kde/cmake-build/install_manifest.txt
similarity index 100%
rename from sflphone-client-kde/cmake-build/install_manifest.txt
rename to kde/cmake-build/install_manifest.txt
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/man/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/man/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/DependInfo.cmake b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/DependInfo.cmake
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/build.make b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/build.make
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/cmake_clean.cmake b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/cmake_clean.cmake
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.internal b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.internal
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.make b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.make
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/progress.make b/kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/progress.make
rename to kde/cmake-build/man/CMakeFiles/man-manpage-sflphone-client-kde.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/man/CMakeFiles/progress.marks b/kde/cmake-build/man/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CMakeFiles/progress.marks
rename to kde/cmake-build/man/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/man/CTestTestfile.cmake b/kde/cmake-build/man/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/CTestTestfile.cmake
rename to kde/cmake-build/man/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/man/Makefile b/kde/cmake-build/man/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/Makefile
rename to kde/cmake-build/man/Makefile
diff --git a/sflphone-client-kde/cmake-build/man/cmake_install.cmake b/kde/cmake-build/man/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/cmake_install.cmake
rename to kde/cmake-build/man/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/man/index.html b/kde/cmake-build/man/index.html
similarity index 100%
rename from sflphone-client-kde/cmake-build/man/index.html
rename to kde/cmake-build/man/index.html
diff --git a/sflphone-client-kde/cmake-build/po/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/CMakeFiles/progress.marks b/kde/cmake-build/po/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/CMakeFiles/progress.marks
rename to kde/cmake-build/po/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/CTestTestfile.cmake b/kde/cmake-build/po/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/CTestTestfile.cmake
rename to kde/cmake-build/po/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/Makefile b/kde/cmake-build/po/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/Makefile
rename to kde/cmake-build/po/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/cmake_install.cmake b/kde/cmake-build/po/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/cmake_install.cmake
rename to kde/cmake-build/po/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/de/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/de/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/de/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/de/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/de/CMakeFiles/progress.marks b/kde/cmake-build/po/de/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CMakeFiles/progress.marks
rename to kde/cmake-build/po/de/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/de/CTestTestfile.cmake b/kde/cmake-build/po/de/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/CTestTestfile.cmake
rename to kde/cmake-build/po/de/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/Makefile b/kde/cmake-build/po/de/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/Makefile
rename to kde/cmake-build/po/de/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/de/cmake_install.cmake b/kde/cmake-build/po/de/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/cmake_install.cmake
rename to kde/cmake-build/po/de/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/de/sflphone-client-kde.gmo b/kde/cmake-build/po/de/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/de/sflphone-client-kde.gmo
rename to kde/cmake-build/po/de/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/es/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/es/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/es/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/es/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/es/CMakeFiles/progress.marks b/kde/cmake-build/po/es/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CMakeFiles/progress.marks
rename to kde/cmake-build/po/es/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/es/CTestTestfile.cmake b/kde/cmake-build/po/es/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/CTestTestfile.cmake
rename to kde/cmake-build/po/es/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/es/Makefile b/kde/cmake-build/po/es/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/Makefile
rename to kde/cmake-build/po/es/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/es/cmake_install.cmake b/kde/cmake-build/po/es/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/cmake_install.cmake
rename to kde/cmake-build/po/es/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/es/sflphone-client-kde.gmo b/kde/cmake-build/po/es/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/es/sflphone-client-kde.gmo
rename to kde/cmake-build/po/es/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/fr/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/fr/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/fr/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/fr/CMakeFiles/progress.marks b/kde/cmake-build/po/fr/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CMakeFiles/progress.marks
rename to kde/cmake-build/po/fr/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/fr/CTestTestfile.cmake b/kde/cmake-build/po/fr/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/CTestTestfile.cmake
rename to kde/cmake-build/po/fr/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/fr/Makefile b/kde/cmake-build/po/fr/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/Makefile
rename to kde/cmake-build/po/fr/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/fr/cmake_install.cmake b/kde/cmake-build/po/fr/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/cmake_install.cmake
rename to kde/cmake-build/po/fr/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/fr/sflphone-client-kde.gmo b/kde/cmake-build/po/fr/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/fr/sflphone-client-kde.gmo
rename to kde/cmake-build/po/fr/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/ru/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/ru/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/ru/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/ru/CMakeFiles/progress.marks b/kde/cmake-build/po/ru/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CMakeFiles/progress.marks
rename to kde/cmake-build/po/ru/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/ru/CTestTestfile.cmake b/kde/cmake-build/po/ru/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/CTestTestfile.cmake
rename to kde/cmake-build/po/ru/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/ru/Makefile b/kde/cmake-build/po/ru/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/Makefile
rename to kde/cmake-build/po/ru/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/ru/cmake_install.cmake b/kde/cmake-build/po/ru/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/cmake_install.cmake
rename to kde/cmake-build/po/ru/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/ru/sflphone-client-kde.gmo b/kde/cmake-build/po/ru/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/ru/sflphone-client-kde.gmo
rename to kde/cmake-build/po/ru/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/zh_CN/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/zh_CN/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/zh_CN/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/progress.marks b/kde/cmake-build/po/zh_CN/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CMakeFiles/progress.marks
rename to kde/cmake-build/po/zh_CN/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/CTestTestfile.cmake b/kde/cmake-build/po/zh_CN/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/CTestTestfile.cmake
rename to kde/cmake-build/po/zh_CN/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/Makefile b/kde/cmake-build/po/zh_CN/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/Makefile
rename to kde/cmake-build/po/zh_CN/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/cmake_install.cmake b/kde/cmake-build/po/zh_CN/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/cmake_install.cmake
rename to kde/cmake-build/po/zh_CN/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_CN/sflphone-client-kde.gmo b/kde/cmake-build/po/zh_CN/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_CN/sflphone-client-kde.gmo
rename to kde/cmake-build/po/zh_CN/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/po/zh_HK/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/po/zh_HK/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/DependInfo.cmake b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/DependInfo.cmake
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/build.make b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/build.make
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/cmake_clean.cmake b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/cmake_clean.cmake
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.internal b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.internal
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.make b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.make
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/progress.make b/kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/progress.make
rename to kde/cmake-build/po/zh_HK/CMakeFiles/pofiles.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/progress.marks b/kde/cmake-build/po/zh_HK/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CMakeFiles/progress.marks
rename to kde/cmake-build/po/zh_HK/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/CTestTestfile.cmake b/kde/cmake-build/po/zh_HK/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/CTestTestfile.cmake
rename to kde/cmake-build/po/zh_HK/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/Makefile b/kde/cmake-build/po/zh_HK/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/Makefile
rename to kde/cmake-build/po/zh_HK/Makefile
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/cmake_install.cmake b/kde/cmake-build/po/zh_HK/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/cmake_install.cmake
rename to kde/cmake-build/po/zh_HK/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/po/zh_HK/sflphone-client-kde.gmo b/kde/cmake-build/po/zh_HK/sflphone-client-kde.gmo
similarity index 100%
rename from sflphone-client-kde/cmake-build/po/zh_HK/sflphone-client-kde.gmo
rename to kde/cmake-build/po/zh_HK/sflphone-client-kde.gmo
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/CMakeDirectoryInformation.cmake b/kde/cmake-build/src/CMakeFiles/CMakeDirectoryInformation.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/CMakeDirectoryInformation.cmake
rename to kde/cmake-build/src/CMakeFiles/CMakeDirectoryInformation.cmake
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/progress.marks b/kde/cmake-build/src/CMakeFiles/progress.marks
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/progress.marks
rename to kde/cmake-build/src/CMakeFiles/progress.marks
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/CXX.includecache b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/CXX.includecache
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/CXX.includecache
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/CXX.includecache
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/DependInfo.cmake b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/DependInfo.cmake
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/build.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/build.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/cmake_clean.cmake b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/cmake_clean.cmake
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.internal b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.internal
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/flags.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/flags.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/flags.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/flags.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/link.txt b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/link.txt
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/link.txt
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/link.txt
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/progress.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/progress.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/DependInfo.cmake b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/DependInfo.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/DependInfo.cmake
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/DependInfo.cmake
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/build.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/build.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/build.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/build.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/cmake_clean.cmake b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/cmake_clean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/cmake_clean.cmake
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/cmake_clean.cmake
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.internal b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.internal
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.internal
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.internal
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/depend.make
diff --git a/sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/progress.make b/kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/progress.make
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/progress.make
rename to kde/cmake-build/src/CMakeFiles/sflphone-client-kde_automoc.dir/progress.make
diff --git a/sflphone-client-kde/cmake-build/src/CTestTestfile.cmake b/kde/cmake-build/src/CTestTestfile.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/CTestTestfile.cmake
rename to kde/cmake-build/src/CTestTestfile.cmake
diff --git a/sflphone-client-kde/cmake-build/src/Makefile b/kde/cmake-build/src/Makefile
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/Makefile
rename to kde/cmake-build/src/Makefile
diff --git a/sflphone-client-kde/cmake-build/src/SFLPhoneView.moc b/kde/cmake-build/src/SFLPhoneView.moc
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/SFLPhoneView.moc
rename to kde/cmake-build/src/SFLPhoneView.moc
diff --git a/sflphone-client-kde/cmake-build/src/SFLPhoneapplication.moc b/kde/cmake-build/src/SFLPhoneapplication.moc
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/SFLPhoneapplication.moc
rename to kde/cmake-build/src/SFLPhoneapplication.moc
diff --git a/sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.cpp b/kde/cmake-build/src/callmanager_dbus_interface.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.cpp
rename to kde/cmake-build/src/callmanager_dbus_interface.cpp
diff --git a/sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.h b/kde/cmake-build/src/callmanager_dbus_interface.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.h
rename to kde/cmake-build/src/callmanager_dbus_interface.h
diff --git a/sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.moc b/kde/cmake-build/src/callmanager_dbus_interface.moc
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/callmanager_dbus_interface.moc
rename to kde/cmake-build/src/callmanager_dbus_interface.moc
diff --git a/sflphone-client-kde/cmake-build/src/cmake_install.cmake b/kde/cmake-build/src/cmake_install.cmake
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/cmake_install.cmake
rename to kde/cmake-build/src/cmake_install.cmake
diff --git a/sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.cpp b/kde/cmake-build/src/configurationmanager_dbus_interface.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.cpp
rename to kde/cmake-build/src/configurationmanager_dbus_interface.cpp
diff --git a/sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.h b/kde/cmake-build/src/configurationmanager_dbus_interface.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.h
rename to kde/cmake-build/src/configurationmanager_dbus_interface.h
diff --git a/sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.moc b/kde/cmake-build/src/configurationmanager_dbus_interface.moc
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/configurationmanager_dbus_interface.moc
rename to kde/cmake-build/src/configurationmanager_dbus_interface.moc
diff --git a/sflphone-client-kde/cmake-build/src/instance_dbus_interface.cpp b/kde/cmake-build/src/instance_dbus_interface.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/instance_dbus_interface.cpp
rename to kde/cmake-build/src/instance_dbus_interface.cpp
diff --git a/sflphone-client-kde/cmake-build/src/instance_dbus_interface.h b/kde/cmake-build/src/instance_dbus_interface.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/instance_dbus_interface.h
rename to kde/cmake-build/src/instance_dbus_interface.h
diff --git a/sflphone-client-kde/cmake-build/src/instance_dbus_interface.moc b/kde/cmake-build/src/instance_dbus_interface.moc
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/instance_dbus_interface.moc
rename to kde/cmake-build/src/instance_dbus_interface.moc
diff --git a/sflphone-client-kde/cmake-build/src/kcfg_settings.cpp b/kde/cmake-build/src/kcfg_settings.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/kcfg_settings.cpp
rename to kde/cmake-build/src/kcfg_settings.cpp
diff --git a/sflphone-client-kde/cmake-build/src/kcfg_settings.h b/kde/cmake-build/src/kcfg_settings.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/kcfg_settings.h
rename to kde/cmake-build/src/kcfg_settings.h
diff --git a/sflphone-client-kde/cmake-build/src/moc_Account.cpp b/kde/cmake-build/src/moc_Account.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_Account.cpp
rename to kde/cmake-build/src/moc_Account.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_AccountItemWidget.cpp b/kde/cmake-build/src/moc_AccountItemWidget.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_AccountItemWidget.cpp
rename to kde/cmake-build/src/moc_AccountItemWidget.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_AccountList.cpp b/kde/cmake-build/src/moc_AccountList.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_AccountList.cpp
rename to kde/cmake-build/src/moc_AccountList.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_AccountListModel.cpp b/kde/cmake-build/src/moc_AccountListModel.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_AccountListModel.cpp
rename to kde/cmake-build/src/moc_AccountListModel.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_AccountWizard.cpp b/kde/cmake-build/src/moc_AccountWizard.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_AccountWizard.cpp
rename to kde/cmake-build/src/moc_AccountWizard.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_ActionSetAccountFirst.cpp b/kde/cmake-build/src/moc_ActionSetAccountFirst.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_ActionSetAccountFirst.cpp
rename to kde/cmake-build/src/moc_ActionSetAccountFirst.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_Call.cpp b/kde/cmake-build/src/moc_Call.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_Call.cpp
rename to kde/cmake-build/src/moc_Call.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_CallModel.cpp b/kde/cmake-build/src/moc_CallModel.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_CallModel.cpp
rename to kde/cmake-build/src/moc_CallModel.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_CallTreeItem.cpp b/kde/cmake-build/src/moc_CallTreeItem.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_CallTreeItem.cpp
rename to kde/cmake-build/src/moc_CallTreeItem.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_Codec.cpp b/kde/cmake-build/src/moc_Codec.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_Codec.cpp
rename to kde/cmake-build/src/moc_Codec.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_ConfigurationDialog.cpp b/kde/cmake-build/src/moc_ConfigurationDialog.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_ConfigurationDialog.cpp
rename to kde/cmake-build/src/moc_ConfigurationDialog.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_ConfigurationSkeleton.cpp b/kde/cmake-build/src/moc_ConfigurationSkeleton.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_ConfigurationSkeleton.cpp
rename to kde/cmake-build/src/moc_ConfigurationSkeleton.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_ContactItemWidget.cpp b/kde/cmake-build/src/moc_ContactItemWidget.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_ContactItemWidget.cpp
rename to kde/cmake-build/src/moc_ContactItemWidget.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_Dialpad.cpp b/kde/cmake-build/src/moc_Dialpad.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_Dialpad.cpp
rename to kde/cmake-build/src/moc_Dialpad.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_SFLPhone.cpp b/kde/cmake-build/src/moc_SFLPhone.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_SFLPhone.cpp
rename to kde/cmake-build/src/moc_SFLPhone.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_SFLPhoneTray.cpp b/kde/cmake-build/src/moc_SFLPhoneTray.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_SFLPhoneTray.cpp
rename to kde/cmake-build/src/moc_SFLPhoneTray.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlgaccounts.cpp b/kde/cmake-build/src/moc_dlgaccounts.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlgaccounts.cpp
rename to kde/cmake-build/src/moc_dlgaccounts.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlgaddressbook.cpp b/kde/cmake-build/src/moc_dlgaddressbook.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlgaddressbook.cpp
rename to kde/cmake-build/src/moc_dlgaddressbook.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlgaudio.cpp b/kde/cmake-build/src/moc_dlgaudio.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlgaudio.cpp
rename to kde/cmake-build/src/moc_dlgaudio.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlgdisplay.cpp b/kde/cmake-build/src/moc_dlgdisplay.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlgdisplay.cpp
rename to kde/cmake-build/src/moc_dlgdisplay.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlggeneral.cpp b/kde/cmake-build/src/moc_dlggeneral.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlggeneral.cpp
rename to kde/cmake-build/src/moc_dlggeneral.cpp
diff --git a/sflphone-client-kde/cmake-build/src/moc_dlghooks.cpp b/kde/cmake-build/src/moc_dlghooks.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/moc_dlghooks.cpp
rename to kde/cmake-build/src/moc_dlghooks.cpp
diff --git a/sflphone-client-kde/cmake-build/src/qrc_resources.cxx b/kde/cmake-build/src/qrc_resources.cxx
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/qrc_resources.cxx
rename to kde/cmake-build/src/qrc_resources.cxx
diff --git a/sflphone-client-kde/cmake-build/src/sflphone-client-kde b/kde/cmake-build/src/sflphone-client-kde
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/sflphone-client-kde
rename to kde/cmake-build/src/sflphone-client-kde
diff --git a/sflphone-client-kde/cmake-build/src/sflphone-client-kde.shell b/kde/cmake-build/src/sflphone-client-kde.shell
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/sflphone-client-kde.shell
rename to kde/cmake-build/src/sflphone-client-kde.shell
diff --git a/sflphone-client-kde/cmake-build/src/sflphone-client-kde_automoc.cpp b/kde/cmake-build/src/sflphone-client-kde_automoc.cpp
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/sflphone-client-kde_automoc.cpp
rename to kde/cmake-build/src/sflphone-client-kde_automoc.cpp
diff --git a/sflphone-client-kde/cmake-build/src/sflphone-client-kde_automoc.cpp.files b/kde/cmake-build/src/sflphone-client-kde_automoc.cpp.files
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/sflphone-client-kde_automoc.cpp.files
rename to kde/cmake-build/src/sflphone-client-kde_automoc.cpp.files
diff --git a/sflphone-client-kde/cmake-build/src/ui_SFLPhoneView_base.h b/kde/cmake-build/src/ui_SFLPhoneView_base.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_SFLPhoneView_base.h
rename to kde/cmake-build/src/ui_SFLPhoneView_base.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlgaccountsbase.h b/kde/cmake-build/src/ui_dlgaccountsbase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlgaccountsbase.h
rename to kde/cmake-build/src/ui_dlgaccountsbase.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlgaddressbookbase.h b/kde/cmake-build/src/ui_dlgaddressbookbase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlgaddressbookbase.h
rename to kde/cmake-build/src/ui_dlgaddressbookbase.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlgaudiobase.h b/kde/cmake-build/src/ui_dlgaudiobase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlgaudiobase.h
rename to kde/cmake-build/src/ui_dlgaudiobase.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlgdisplaybase.h b/kde/cmake-build/src/ui_dlgdisplaybase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlgdisplaybase.h
rename to kde/cmake-build/src/ui_dlgdisplaybase.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlggeneralbase.h b/kde/cmake-build/src/ui_dlggeneralbase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlggeneralbase.h
rename to kde/cmake-build/src/ui_dlggeneralbase.h
diff --git a/sflphone-client-kde/cmake-build/src/ui_dlghooksbase.h b/kde/cmake-build/src/ui_dlghooksbase.h
similarity index 100%
rename from sflphone-client-kde/cmake-build/src/ui_dlghooksbase.h
rename to kde/cmake-build/src/ui_dlghooksbase.h
diff --git a/sflphone-client-kde/cmake/FindKabc.cmake b/kde/cmake/FindKabc.cmake
similarity index 100%
rename from sflphone-client-kde/cmake/FindKabc.cmake
rename to kde/cmake/FindKabc.cmake
diff --git a/sflphone-client-kde/cmake/FindQt4.cmake b/kde/cmake/FindQt4.cmake
similarity index 100%
rename from sflphone-client-kde/cmake/FindQt4.cmake
rename to kde/cmake/FindQt4.cmake
diff --git a/sflphone-client-kde/cmake/TargetDistclean.cmake b/kde/cmake/TargetDistclean.cmake
similarity index 100%
rename from sflphone-client-kde/cmake/TargetDistclean.cmake
rename to kde/cmake/TargetDistclean.cmake
diff --git a/sflphone-client-kde/config.sh b/kde/config.sh
similarity index 100%
rename from sflphone-client-kde/config.sh
rename to kde/config.sh
diff --git a/sflphone-client-kde/data/CMakeLists.txt b/kde/data/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/data/CMakeLists.txt
rename to kde/data/CMakeLists.txt
diff --git a/sflphone-client-kde/data/icons/CMakeLists.txt b/kde/data/icons/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/data/icons/CMakeLists.txt
rename to kde/data/icons/CMakeLists.txt
diff --git a/sflphone-client-kde/data/icons/hi128-apps-sflphone-client-kde.png b/kde/data/icons/hi128-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi128-apps-sflphone-client-kde.png
rename to kde/data/icons/hi128-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hi16-apps-sflphone-client-kde.png b/kde/data/icons/hi16-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi16-apps-sflphone-client-kde.png
rename to kde/data/icons/hi16-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hi22-apps-sflphone-client-kde.png b/kde/data/icons/hi22-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi22-apps-sflphone-client-kde.png
rename to kde/data/icons/hi22-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hi32-apps-sflphone-client-kde.png b/kde/data/icons/hi32-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi32-apps-sflphone-client-kde.png
rename to kde/data/icons/hi32-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hi48-apps-sflphone-client-kde.png b/kde/data/icons/hi48-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi48-apps-sflphone-client-kde.png
rename to kde/data/icons/hi48-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hi64-apps-sflphone-client-kde.png b/kde/data/icons/hi64-apps-sflphone-client-kde.png
similarity index 100%
rename from sflphone-client-kde/data/icons/hi64-apps-sflphone-client-kde.png
rename to kde/data/icons/hi64-apps-sflphone-client-kde.png
diff --git a/sflphone-client-kde/data/icons/hisc-apps-sflphone-client-kde.svgz b/kde/data/icons/hisc-apps-sflphone-client-kde.svgz
similarity index 100%
rename from sflphone-client-kde/data/icons/hisc-apps-sflphone-client-kde.svgz
rename to kde/data/icons/hisc-apps-sflphone-client-kde.svgz
diff --git a/sflphone-client-kde/data/icons/small/hi16-apps-sflphone-client-kde.svgz b/kde/data/icons/small/hi16-apps-sflphone-client-kde.svgz
similarity index 100%
rename from sflphone-client-kde/data/icons/small/hi16-apps-sflphone-client-kde.svgz
rename to kde/data/icons/small/hi16-apps-sflphone-client-kde.svgz
diff --git a/sflphone-client-kde/data/icons/small/hi32-apps-sflphone-client-kde.svg b/kde/data/icons/small/hi32-apps-sflphone-client-kde.svg
similarity index 100%
rename from sflphone-client-kde/data/icons/small/hi32-apps-sflphone-client-kde.svg
rename to kde/data/icons/small/hi32-apps-sflphone-client-kde.svg
diff --git a/sflphone-client-kde/data/sflphone-client-kde.desktop b/kde/data/sflphone-client-kde.desktop
similarity index 100%
rename from sflphone-client-kde/data/sflphone-client-kde.desktop
rename to kde/data/sflphone-client-kde.desktop
diff --git a/sflphone-client-kde/data/sflphone-client-kde.notifyrc b/kde/data/sflphone-client-kde.notifyrc
similarity index 100%
rename from sflphone-client-kde/data/sflphone-client-kde.notifyrc
rename to kde/data/sflphone-client-kde.notifyrc
diff --git a/sflphone-client-kde/data/sflphone-client-kdeui.rc b/kde/data/sflphone-client-kdeui.rc
similarity index 100%
rename from sflphone-client-kde/data/sflphone-client-kdeui.rc
rename to kde/data/sflphone-client-kdeui.rc
diff --git a/sflphone-client-kde/doc/CMakeLists.txt b/kde/doc/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/doc/CMakeLists.txt
rename to kde/doc/CMakeLists.txt
diff --git a/sflphone-client-kde/doc/advanced-use.docbook b/kde/doc/advanced-use.docbook
similarity index 100%
rename from sflphone-client-kde/doc/advanced-use.docbook
rename to kde/doc/advanced-use.docbook
diff --git a/sflphone-client-kde/doc/basic-use.docbook b/kde/doc/basic-use.docbook
similarity index 100%
rename from sflphone-client-kde/doc/basic-use.docbook
rename to kde/doc/basic-use.docbook
diff --git a/sflphone-client-kde/doc/common-use.docbook b/kde/doc/common-use.docbook
similarity index 100%
rename from sflphone-client-kde/doc/common-use.docbook
rename to kde/doc/common-use.docbook
diff --git a/sflphone-client-kde/doc/credits.docbook b/kde/doc/credits.docbook
similarity index 100%
rename from sflphone-client-kde/doc/credits.docbook
rename to kde/doc/credits.docbook
diff --git a/sflphone-client-kde/doc/getting-started.docbook b/kde/doc/getting-started.docbook
similarity index 100%
rename from sflphone-client-kde/doc/getting-started.docbook
rename to kde/doc/getting-started.docbook
diff --git a/sflphone-client-kde/doc/index.docbook b/kde/doc/index.docbook
similarity index 100%
rename from sflphone-client-kde/doc/index.docbook
rename to kde/doc/index.docbook
diff --git a/sflphone-client-kde/doc/introduction.docbook b/kde/doc/introduction.docbook
similarity index 100%
rename from sflphone-client-kde/doc/introduction.docbook
rename to kde/doc/introduction.docbook
diff --git a/sflphone-client-kde/doc/introduction/introduction.html b/kde/doc/introduction/introduction.html
similarity index 100%
rename from sflphone-client-kde/doc/introduction/introduction.html
rename to kde/doc/introduction/introduction.html
diff --git a/sflphone-client-kde/doc/wizard-create-email.png b/kde/doc/wizard-create-email.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-create-email.png
rename to kde/doc/wizard-create-email.png
diff --git a/sflphone-client-kde/doc/wizard-createorregister.png b/kde/doc/wizard-createorregister.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-createorregister.png
rename to kde/doc/wizard-createorregister.png
diff --git a/sflphone-client-kde/doc/wizard-finish.png b/kde/doc/wizard-finish.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-finish.png
rename to kde/doc/wizard-finish.png
diff --git a/sflphone-client-kde/doc/wizard-register-settings.png b/kde/doc/wizard-register-settings.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-register-settings.png
rename to kde/doc/wizard-register-settings.png
diff --git a/sflphone-client-kde/doc/wizard-register-siporiax.png b/kde/doc/wizard-register-siporiax.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-register-siporiax.png
rename to kde/doc/wizard-register-siporiax.png
diff --git a/sflphone-client-kde/doc/wizard-stun.png b/kde/doc/wizard-stun.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-stun.png
rename to kde/doc/wizard-stun.png
diff --git a/sflphone-client-kde/doc/wizard-welcome.png b/kde/doc/wizard-welcome.png
similarity index 100%
rename from sflphone-client-kde/doc/wizard-welcome.png
rename to kde/doc/wizard-welcome.png
diff --git a/sflphone-client-kde/man/CMakeLists.txt b/kde/man/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/man/CMakeLists.txt
rename to kde/man/CMakeLists.txt
diff --git a/sflphone-common/man/README.manpages b/kde/man/README.manpages
similarity index 100%
rename from sflphone-common/man/README.manpages
rename to kde/man/README.manpages
diff --git a/sflphone-client-kde/man/sflphone-client-kde.1.docbook b/kde/man/sflphone-client-kde.1.docbook
similarity index 100%
rename from sflphone-client-kde/man/sflphone-client-kde.1.docbook
rename to kde/man/sflphone-client-kde.1.docbook
diff --git a/sflphone-client-kde/man/sflphone-client-kde.pod b/kde/man/sflphone-client-kde.pod
similarity index 100%
rename from sflphone-client-kde/man/sflphone-client-kde.pod
rename to kde/man/sflphone-client-kde.pod
diff --git a/sflphone-client-kde/man/sflphone.pod b/kde/man/sflphone.pod
similarity index 100%
rename from sflphone-client-kde/man/sflphone.pod
rename to kde/man/sflphone.pod
diff --git a/sflphone-client-kde/po/CMakeLists.txt b/kde/po/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/CMakeLists.txt
rename to kde/po/CMakeLists.txt
diff --git a/sflphone-client-kde/po/README b/kde/po/README
similarity index 100%
rename from sflphone-client-kde/po/README
rename to kde/po/README
diff --git a/sflphone-client-kde/po/de/CMakeLists.txt b/kde/po/de/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/de/CMakeLists.txt
rename to kde/po/de/CMakeLists.txt
diff --git a/sflphone-client-kde/po/de/sflphone-client-kde.po b/kde/po/de/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/de/sflphone-client-kde.po
rename to kde/po/de/sflphone-client-kde.po
diff --git a/sflphone-client-kde/po/es/CMakeLists.txt b/kde/po/es/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/es/CMakeLists.txt
rename to kde/po/es/CMakeLists.txt
diff --git a/sflphone-client-kde/po/es/sflphone-client-kde.po b/kde/po/es/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/es/sflphone-client-kde.po
rename to kde/po/es/sflphone-client-kde.po
diff --git a/sflphone-client-kde/po/fr/CMakeLists.txt b/kde/po/fr/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/fr/CMakeLists.txt
rename to kde/po/fr/CMakeLists.txt
diff --git a/sflphone-client-kde/po/fr/sflphone-client-kde.po b/kde/po/fr/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/fr/sflphone-client-kde.po
rename to kde/po/fr/sflphone-client-kde.po
diff --git a/sflphone-client-kde/po/ru/CMakeLists.txt b/kde/po/ru/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/ru/CMakeLists.txt
rename to kde/po/ru/CMakeLists.txt
diff --git a/sflphone-client-kde/po/ru/sflphone-client-kde.po b/kde/po/ru/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/ru/sflphone-client-kde.po
rename to kde/po/ru/sflphone-client-kde.po
diff --git a/sflphone-client-kde/po/zh_CN/CMakeLists.txt b/kde/po/zh_CN/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/zh_CN/CMakeLists.txt
rename to kde/po/zh_CN/CMakeLists.txt
diff --git a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po b/kde/po/zh_CN/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/zh_CN/sflphone-client-kde.po
rename to kde/po/zh_CN/sflphone-client-kde.po
diff --git a/sflphone-client-kde/po/zh_HK/CMakeLists.txt b/kde/po/zh_HK/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/po/zh_HK/CMakeLists.txt
rename to kde/po/zh_HK/CMakeLists.txt
diff --git a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po b/kde/po/zh_HK/sflphone-client-kde.po
similarity index 100%
rename from sflphone-client-kde/po/zh_HK/sflphone-client-kde.po
rename to kde/po/zh_HK/sflphone-client-kde.po
diff --git a/sflphone-client-kde/sflphone-client-kde.kdevelop b/kde/sflphone-client-kde.kdevelop
similarity index 100%
rename from sflphone-client-kde/sflphone-client-kde.kdevelop
rename to kde/sflphone-client-kde.kdevelop
diff --git a/sflphone-client-kde/src/Account.cpp b/kde/src/Account.cpp
similarity index 100%
rename from sflphone-client-kde/src/Account.cpp
rename to kde/src/Account.cpp
diff --git a/sflphone-client-kde/src/Account.h b/kde/src/Account.h
similarity index 100%
rename from sflphone-client-kde/src/Account.h
rename to kde/src/Account.h
diff --git a/sflphone-client-kde/src/AccountItemWidget.cpp b/kde/src/AccountItemWidget.cpp
similarity index 100%
rename from sflphone-client-kde/src/AccountItemWidget.cpp
rename to kde/src/AccountItemWidget.cpp
diff --git a/sflphone-client-kde/src/AccountItemWidget.h b/kde/src/AccountItemWidget.h
similarity index 100%
rename from sflphone-client-kde/src/AccountItemWidget.h
rename to kde/src/AccountItemWidget.h
diff --git a/sflphone-client-kde/src/AccountList.cpp b/kde/src/AccountList.cpp
similarity index 100%
rename from sflphone-client-kde/src/AccountList.cpp
rename to kde/src/AccountList.cpp
diff --git a/sflphone-client-kde/src/AccountList.h b/kde/src/AccountList.h
similarity index 100%
rename from sflphone-client-kde/src/AccountList.h
rename to kde/src/AccountList.h
diff --git a/sflphone-client-kde/src/AccountListModel.cpp b/kde/src/AccountListModel.cpp
similarity index 100%
rename from sflphone-client-kde/src/AccountListModel.cpp
rename to kde/src/AccountListModel.cpp
diff --git a/sflphone-client-kde/src/AccountListModel.h b/kde/src/AccountListModel.h
similarity index 100%
rename from sflphone-client-kde/src/AccountListModel.h
rename to kde/src/AccountListModel.h
diff --git a/sflphone-client-kde/src/AccountWizard.cpp b/kde/src/AccountWizard.cpp
similarity index 100%
rename from sflphone-client-kde/src/AccountWizard.cpp
rename to kde/src/AccountWizard.cpp
diff --git a/sflphone-client-kde/src/AccountWizard.h b/kde/src/AccountWizard.h
similarity index 100%
rename from sflphone-client-kde/src/AccountWizard.h
rename to kde/src/AccountWizard.h
diff --git a/sflphone-client-kde/src/ActionSetAccountFirst.cpp b/kde/src/ActionSetAccountFirst.cpp
similarity index 100%
rename from sflphone-client-kde/src/ActionSetAccountFirst.cpp
rename to kde/src/ActionSetAccountFirst.cpp
diff --git a/sflphone-client-kde/src/ActionSetAccountFirst.h b/kde/src/ActionSetAccountFirst.h
similarity index 100%
rename from sflphone-client-kde/src/ActionSetAccountFirst.h
rename to kde/src/ActionSetAccountFirst.h
diff --git a/sflphone-client-kde/src/CMakeLists.txt b/kde/src/CMakeLists.txt
similarity index 100%
rename from sflphone-client-kde/src/CMakeLists.txt
rename to kde/src/CMakeLists.txt
diff --git a/sflphone-client-kde/src/Call.cpp b/kde/src/Call.cpp
similarity index 100%
rename from sflphone-client-kde/src/Call.cpp
rename to kde/src/Call.cpp
diff --git a/sflphone-client-kde/src/Call.h b/kde/src/Call.h
similarity index 100%
rename from sflphone-client-kde/src/Call.h
rename to kde/src/Call.h
diff --git a/sflphone-client-kde/src/CallModel.cpp b/kde/src/CallModel.cpp
similarity index 100%
rename from sflphone-client-kde/src/CallModel.cpp
rename to kde/src/CallModel.cpp
diff --git a/sflphone-client-kde/src/CallModel.h b/kde/src/CallModel.h
similarity index 100%
rename from sflphone-client-kde/src/CallModel.h
rename to kde/src/CallModel.h
diff --git a/sflphone-client-kde/src/CallTreeItem.cpp b/kde/src/CallTreeItem.cpp
similarity index 100%
rename from sflphone-client-kde/src/CallTreeItem.cpp
rename to kde/src/CallTreeItem.cpp
diff --git a/sflphone-client-kde/src/CallTreeItem.h b/kde/src/CallTreeItem.h
similarity index 100%
rename from sflphone-client-kde/src/CallTreeItem.h
rename to kde/src/CallTreeItem.h
diff --git a/sflphone-client-kde/src/Codec.cpp b/kde/src/Codec.cpp
similarity index 100%
rename from sflphone-client-kde/src/Codec.cpp
rename to kde/src/Codec.cpp
diff --git a/sflphone-client-kde/src/Codec.h b/kde/src/Codec.h
similarity index 100%
rename from sflphone-client-kde/src/Codec.h
rename to kde/src/Codec.h
diff --git a/sflphone-client-kde/src/Contact.cpp b/kde/src/Contact.cpp
similarity index 100%
rename from sflphone-client-kde/src/Contact.cpp
rename to kde/src/Contact.cpp
diff --git a/sflphone-client-kde/src/Contact.h b/kde/src/Contact.h
similarity index 100%
rename from sflphone-client-kde/src/Contact.h
rename to kde/src/Contact.h
diff --git a/sflphone-client-kde/src/ContactItemWidget.cpp b/kde/src/ContactItemWidget.cpp
similarity index 100%
rename from sflphone-client-kde/src/ContactItemWidget.cpp
rename to kde/src/ContactItemWidget.cpp
diff --git a/sflphone-client-kde/src/ContactItemWidget.h b/kde/src/ContactItemWidget.h
similarity index 100%
rename from sflphone-client-kde/src/ContactItemWidget.h
rename to kde/src/ContactItemWidget.h
diff --git a/sflphone-client-kde/src/Dialpad.cpp b/kde/src/Dialpad.cpp
similarity index 100%
rename from sflphone-client-kde/src/Dialpad.cpp
rename to kde/src/Dialpad.cpp
diff --git a/sflphone-client-kde/src/Dialpad.h b/kde/src/Dialpad.h
similarity index 100%
rename from sflphone-client-kde/src/Dialpad.h
rename to kde/src/Dialpad.h
diff --git a/sflphone-client-kde/src/Item.cpp b/kde/src/Item.cpp
similarity index 100%
rename from sflphone-client-kde/src/Item.cpp
rename to kde/src/Item.cpp
diff --git a/sflphone-client-kde/src/Item.h b/kde/src/Item.h
similarity index 100%
rename from sflphone-client-kde/src/Item.h
rename to kde/src/Item.h
diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp
similarity index 100%
rename from sflphone-client-kde/src/SFLPhone.cpp
rename to kde/src/SFLPhone.cpp
diff --git a/sflphone-client-kde/src/SFLPhone.h b/kde/src/SFLPhone.h
similarity index 100%
rename from sflphone-client-kde/src/SFLPhone.h
rename to kde/src/SFLPhone.h
diff --git a/sflphone-client-kde/src/SFLPhoneTray.cpp b/kde/src/SFLPhoneTray.cpp
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneTray.cpp
rename to kde/src/SFLPhoneTray.cpp
diff --git a/sflphone-client-kde/src/SFLPhoneTray.h b/kde/src/SFLPhoneTray.h
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneTray.h
rename to kde/src/SFLPhoneTray.h
diff --git a/sflphone-client-kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneView.cpp
rename to kde/src/SFLPhoneView.cpp
diff --git a/sflphone-client-kde/src/SFLPhoneView.h b/kde/src/SFLPhoneView.h
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneView.h
rename to kde/src/SFLPhoneView.h
diff --git a/sflphone-client-kde/src/SFLPhoneapplication.cpp b/kde/src/SFLPhoneapplication.cpp
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneapplication.cpp
rename to kde/src/SFLPhoneapplication.cpp
diff --git a/sflphone-client-kde/src/SFLPhoneapplication.h b/kde/src/SFLPhoneapplication.h
similarity index 100%
rename from sflphone-client-kde/src/SFLPhoneapplication.h
rename to kde/src/SFLPhoneapplication.h
diff --git a/sflphone-client-kde/src/SortableCodecListWidget.cpp b/kde/src/SortableCodecListWidget.cpp
similarity index 100%
rename from sflphone-client-kde/src/SortableCodecListWidget.cpp
rename to kde/src/SortableCodecListWidget.cpp
diff --git a/sflphone-client-kde/src/SortableCodecListWidget.h b/kde/src/SortableCodecListWidget.h
similarity index 100%
rename from sflphone-client-kde/src/SortableCodecListWidget.h
rename to kde/src/SortableCodecListWidget.h
diff --git a/sflphone-client-kde/src/callmanager_interface_singleton.cpp b/kde/src/callmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/src/callmanager_interface_singleton.cpp
rename to kde/src/callmanager_interface_singleton.cpp
diff --git a/sflphone-client-kde/src/callmanager_interface_singleton.h b/kde/src/callmanager_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/src/callmanager_interface_singleton.h
rename to kde/src/callmanager_interface_singleton.h
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp b/kde/src/conf/ConfigurationDialog.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/ConfigurationDialog.cpp
rename to kde/src/conf/ConfigurationDialog.cpp
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.h b/kde/src/conf/ConfigurationDialog.h
similarity index 100%
rename from sflphone-client-kde/src/conf/ConfigurationDialog.h
rename to kde/src/conf/ConfigurationDialog.h
diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp b/kde/src/conf/ConfigurationSkeleton.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
rename to kde/src/conf/ConfigurationSkeleton.cpp
diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.h b/kde/src/conf/ConfigurationSkeleton.h
similarity index 100%
rename from sflphone-client-kde/src/conf/ConfigurationSkeleton.h
rename to kde/src/conf/ConfigurationSkeleton.h
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/kde/src/conf/dlgaccounts.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaccounts.cpp
rename to kde/src/conf/dlgaccounts.cpp
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.h b/kde/src/conf/dlgaccounts.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaccounts.h
rename to kde/src/conf/dlgaccounts.h
diff --git a/sflphone-client-kde/src/conf/dlgaccountsbase.ui b/kde/src/conf/dlgaccountsbase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaccountsbase.ui
rename to kde/src/conf/dlgaccountsbase.ui
diff --git a/sflphone-client-kde/src/conf/dlgaddressbook.cpp b/kde/src/conf/dlgaddressbook.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaddressbook.cpp
rename to kde/src/conf/dlgaddressbook.cpp
diff --git a/sflphone-client-kde/src/conf/dlgaddressbook.h b/kde/src/conf/dlgaddressbook.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaddressbook.h
rename to kde/src/conf/dlgaddressbook.h
diff --git a/sflphone-client-kde/src/conf/dlgaddressbookbase.ui b/kde/src/conf/dlgaddressbookbase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaddressbookbase.ui
rename to kde/src/conf/dlgaddressbookbase.ui
diff --git a/sflphone-client-kde/src/conf/dlgaudio.cpp b/kde/src/conf/dlgaudio.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaudio.cpp
rename to kde/src/conf/dlgaudio.cpp
diff --git a/sflphone-client-kde/src/conf/dlgaudio.h b/kde/src/conf/dlgaudio.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaudio.h
rename to kde/src/conf/dlgaudio.h
diff --git a/sflphone-client-kde/src/conf/dlgaudiobase.ui b/kde/src/conf/dlgaudiobase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgaudiobase.ui
rename to kde/src/conf/dlgaudiobase.ui
diff --git a/sflphone-client-kde/src/conf/dlgdisplay.cpp b/kde/src/conf/dlgdisplay.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgdisplay.cpp
rename to kde/src/conf/dlgdisplay.cpp
diff --git a/sflphone-client-kde/src/conf/dlgdisplay.h b/kde/src/conf/dlgdisplay.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgdisplay.h
rename to kde/src/conf/dlgdisplay.h
diff --git a/sflphone-client-kde/src/conf/dlgdisplaybase.ui b/kde/src/conf/dlgdisplaybase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlgdisplaybase.ui
rename to kde/src/conf/dlgdisplaybase.ui
diff --git a/sflphone-client-kde/src/conf/dlggeneral.cpp b/kde/src/conf/dlggeneral.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlggeneral.cpp
rename to kde/src/conf/dlggeneral.cpp
diff --git a/sflphone-client-kde/src/conf/dlggeneral.h b/kde/src/conf/dlggeneral.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlggeneral.h
rename to kde/src/conf/dlggeneral.h
diff --git a/sflphone-client-kde/src/conf/dlggeneralbase.ui b/kde/src/conf/dlggeneralbase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlggeneralbase.ui
rename to kde/src/conf/dlggeneralbase.ui
diff --git a/sflphone-client-kde/src/conf/dlghooks.cpp b/kde/src/conf/dlghooks.cpp
similarity index 100%
rename from sflphone-client-kde/src/conf/dlghooks.cpp
rename to kde/src/conf/dlghooks.cpp
diff --git a/sflphone-client-kde/src/conf/dlghooks.h b/kde/src/conf/dlghooks.h
similarity index 100%
rename from sflphone-client-kde/src/conf/dlghooks.h
rename to kde/src/conf/dlghooks.h
diff --git a/sflphone-client-kde/src/conf/dlghooksbase.ui b/kde/src/conf/dlghooksbase.ui
similarity index 100%
rename from sflphone-client-kde/src/conf/dlghooksbase.ui
rename to kde/src/conf/dlghooksbase.ui
diff --git a/sflphone-client-kde/src/conf/kcfg_settings.kcfgc b/kde/src/conf/kcfg_settings.kcfgc
similarity index 100%
rename from sflphone-client-kde/src/conf/kcfg_settings.kcfgc
rename to kde/src/conf/kcfg_settings.kcfgc
diff --git a/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg b/kde/src/conf/sflphone-client-kde.kcfg
similarity index 100%
rename from sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
rename to kde/src/conf/sflphone-client-kde.kcfg
diff --git a/sflphone-client-kde/src/configurationmanager_interface_singleton.cpp b/kde/src/configurationmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/src/configurationmanager_interface_singleton.cpp
rename to kde/src/configurationmanager_interface_singleton.cpp
diff --git a/sflphone-client-kde/src/configurationmanager_interface_singleton.h b/kde/src/configurationmanager_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/src/configurationmanager_interface_singleton.h
rename to kde/src/configurationmanager_interface_singleton.h
diff --git a/sflphone-client-kde/src/dbus/callmanager-introspec.xml b/kde/src/dbus/callmanager-introspec.xml
similarity index 100%
rename from sflphone-client-kde/src/dbus/callmanager-introspec.xml
rename to kde/src/dbus/callmanager-introspec.xml
diff --git a/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml b/kde/src/dbus/configurationmanager-introspec.xml
similarity index 100%
rename from sflphone-client-kde/src/dbus/configurationmanager-introspec.xml
rename to kde/src/dbus/configurationmanager-introspec.xml
diff --git a/sflphone-common/src/dbus/instance-introspec.xml b/kde/src/dbus/instance-introspec.xml
similarity index 100%
rename from sflphone-common/src/dbus/instance-introspec.xml
rename to kde/src/dbus/instance-introspec.xml
diff --git a/sflphone-client-kde/src/dbus/metatypes.h b/kde/src/dbus/metatypes.h
similarity index 100%
rename from sflphone-client-kde/src/dbus/metatypes.h
rename to kde/src/dbus/metatypes.h
diff --git a/sflphone-client-kde/src/icons/accept.svg b/kde/src/icons/accept.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/accept.svg
rename to kde/src/icons/accept.svg
diff --git a/sflphone-client-kde/src/icons/add.png b/kde/src/icons/add.png
similarity index 100%
rename from sflphone-client-kde/src/icons/add.png
rename to kde/src/icons/add.png
diff --git a/sflphone-client-kde/src/icons/busy.svg b/kde/src/icons/busy.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/busy.svg
rename to kde/src/icons/busy.svg
diff --git a/sflphone-client-kde/src/icons/call.svg b/kde/src/icons/call.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/call.svg
rename to kde/src/icons/call.svg
diff --git a/sflphone-client-kde/src/icons/current.svg b/kde/src/icons/current.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/current.svg
rename to kde/src/icons/current.svg
diff --git a/sflphone-client-kde/src/icons/dial.svg b/kde/src/icons/dial.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/dial.svg
rename to kde/src/icons/dial.svg
diff --git a/sflphone-client-kde/src/icons/document-encrypt.svgz b/kde/src/icons/document-encrypt.svgz
similarity index 100%
rename from sflphone-client-kde/src/icons/document-encrypt.svgz
rename to kde/src/icons/document-encrypt.svgz
diff --git a/sflphone-client-kde/src/icons/fail.svg b/kde/src/icons/fail.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/fail.svg
rename to kde/src/icons/fail.svg
diff --git a/sflphone-client-kde/src/icons/hang_up.svg b/kde/src/icons/hang_up.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/hang_up.svg
rename to kde/src/icons/hang_up.svg
diff --git a/sflphone-client-kde/src/icons/history.svg b/kde/src/icons/history.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/history.svg
rename to kde/src/icons/history.svg
diff --git a/sflphone-client-kde/src/icons/history2.svg b/kde/src/icons/history2.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/history2.svg
rename to kde/src/icons/history2.svg
diff --git a/sflphone-client-kde/src/icons/hold.svg b/kde/src/icons/hold.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/hold.svg
rename to kde/src/icons/hold.svg
diff --git a/sflphone-client-kde/src/icons/icon_accept.svg b/kde/src/icons/icon_accept.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_accept.svg
rename to kde/src/icons/icon_accept.svg
diff --git a/sflphone-client-kde/src/icons/icon_call.svg b/kde/src/icons/icon_call.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_call.svg
rename to kde/src/icons/icon_call.svg
diff --git a/sflphone-client-kde/src/icons/icon_dialpad.svg b/kde/src/icons/icon_dialpad.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_dialpad.svg
rename to kde/src/icons/icon_dialpad.svg
diff --git a/sflphone-client-kde/src/icons/icon_dialpad_off.svg b/kde/src/icons/icon_dialpad_off.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_dialpad_off.svg
rename to kde/src/icons/icon_dialpad_off.svg
diff --git a/sflphone-client-kde/src/icons/icon_hangup.svg b/kde/src/icons/icon_hangup.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_hangup.svg
rename to kde/src/icons/icon_hangup.svg
diff --git a/sflphone-client-kde/src/icons/icon_hold.svg b/kde/src/icons/icon_hold.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_hold.svg
rename to kde/src/icons/icon_hold.svg
diff --git a/sflphone-client-kde/src/icons/icon_rec.svg b/kde/src/icons/icon_rec.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_rec.svg
rename to kde/src/icons/icon_rec.svg
diff --git a/sflphone-client-kde/src/icons/icon_unhold.svg b/kde/src/icons/icon_unhold.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_unhold.svg
rename to kde/src/icons/icon_unhold.svg
diff --git a/sflphone-client-kde/src/icons/icon_volume.svg b/kde/src/icons/icon_volume.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_volume.svg
rename to kde/src/icons/icon_volume.svg
diff --git a/sflphone-client-kde/src/icons/icon_volume_off.svg b/kde/src/icons/icon_volume_off.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/icon_volume_off.svg
rename to kde/src/icons/icon_volume_off.svg
diff --git a/sflphone-client-kde/src/icons/incoming.svg b/kde/src/icons/incoming.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/incoming.svg
rename to kde/src/icons/incoming.svg
diff --git a/sflphone-client-kde/src/icons/led-gray.svg b/kde/src/icons/led-gray.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/led-gray.svg
rename to kde/src/icons/led-gray.svg
diff --git a/sflphone-client-kde/src/icons/led-green.svg b/kde/src/icons/led-green.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/led-green.svg
rename to kde/src/icons/led-green.svg
diff --git a/sflphone-client-kde/src/icons/led-red.svg b/kde/src/icons/led-red.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/led-red.svg
rename to kde/src/icons/led-red.svg
diff --git a/sflphone-client-kde/src/icons/mailbox.svg b/kde/src/icons/mailbox.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/mailbox.svg
rename to kde/src/icons/mailbox.svg
diff --git a/sflphone-client-kde/src/icons/mic.svg b/kde/src/icons/mic.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/mic.svg
rename to kde/src/icons/mic.svg
diff --git a/sflphone-client-kde/src/icons/mic_25.svg b/kde/src/icons/mic_25.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/mic_25.svg
rename to kde/src/icons/mic_25.svg
diff --git a/sflphone-client-kde/src/icons/mic_50.svg b/kde/src/icons/mic_50.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/mic_50.svg
rename to kde/src/icons/mic_50.svg
diff --git a/sflphone-client-kde/src/icons/mic_75.svg b/kde/src/icons/mic_75.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/mic_75.svg
rename to kde/src/icons/mic_75.svg
diff --git a/sflphone-client-kde/src/icons/missed.svg b/kde/src/icons/missed.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/missed.svg
rename to kde/src/icons/missed.svg
diff --git a/sflphone-client-kde/src/icons/outgoing.svg b/kde/src/icons/outgoing.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/outgoing.svg
rename to kde/src/icons/outgoing.svg
diff --git a/sflphone-client-kde/src/icons/rec_call.svg b/kde/src/icons/rec_call.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/rec_call.svg
rename to kde/src/icons/rec_call.svg
diff --git a/sflphone-client-kde/src/icons/record.svg b/kde/src/icons/record.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/record.svg
rename to kde/src/icons/record.svg
diff --git a/sflphone-client-kde/src/icons/record_disabled.svg b/kde/src/icons/record_disabled.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/record_disabled.svg
rename to kde/src/icons/record_disabled.svg
diff --git a/sflphone-client-kde/src/icons/refuse.svg b/kde/src/icons/refuse.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/refuse.svg
rename to kde/src/icons/refuse.svg
diff --git a/sflphone-client-kde/src/icons/remove.png b/kde/src/icons/remove.png
similarity index 100%
rename from sflphone-client-kde/src/icons/remove.png
rename to kde/src/icons/remove.png
diff --git a/sflphone-client-kde/src/icons/ring.svg b/kde/src/icons/ring.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/ring.svg
rename to kde/src/icons/ring.svg
diff --git a/sflphone-client-kde/src/icons/sflphone-kde.svg b/kde/src/icons/sflphone-kde.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/sflphone-kde.svg
rename to kde/src/icons/sflphone-kde.svg
diff --git a/sflphone-client-kde/src/icons/sflphone-kde2.svg b/kde/src/icons/sflphone-kde2.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/sflphone-kde2.svg
rename to kde/src/icons/sflphone-kde2.svg
diff --git a/sflphone-client-kde/src/icons/sflphone-kde3.svg b/kde/src/icons/sflphone-kde3.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/sflphone-kde3.svg
rename to kde/src/icons/sflphone-kde3.svg
diff --git a/sflphone-client-kde/src/icons/sflphone.svg b/kde/src/icons/sflphone.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/sflphone.svg
rename to kde/src/icons/sflphone.svg
diff --git a/sflphone-client-kde/src/icons/sflphone_notif.svg b/kde/src/icons/sflphone_notif.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/sflphone_notif.svg
rename to kde/src/icons/sflphone_notif.svg
diff --git a/sflphone-client-kde/src/icons/speaker.svg b/kde/src/icons/speaker.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/speaker.svg
rename to kde/src/icons/speaker.svg
diff --git a/sflphone-client-kde/src/icons/speaker_25.svg b/kde/src/icons/speaker_25.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/speaker_25.svg
rename to kde/src/icons/speaker_25.svg
diff --git a/sflphone-client-kde/src/icons/speaker_50.svg b/kde/src/icons/speaker_50.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/speaker_50.svg
rename to kde/src/icons/speaker_50.svg
diff --git a/sflphone-client-kde/src/icons/speaker_75.svg b/kde/src/icons/speaker_75.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/speaker_75.svg
rename to kde/src/icons/speaker_75.svg
diff --git a/sflphone-client-kde/src/icons/stock_person.svg b/kde/src/icons/stock_person.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/stock_person.svg
rename to kde/src/icons/stock_person.svg
diff --git a/sflphone-client-kde/src/icons/transfert.svg b/kde/src/icons/transfert.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/transfert.svg
rename to kde/src/icons/transfert.svg
diff --git a/sflphone-client-kde/src/icons/unhold.svg b/kde/src/icons/unhold.svg
similarity index 100%
rename from sflphone-client-kde/src/icons/unhold.svg
rename to kde/src/icons/unhold.svg
diff --git a/sflphone-client-kde/src/icons/user-group-properties.svgz b/kde/src/icons/user-group-properties.svgz
similarity index 100%
rename from sflphone-client-kde/src/icons/user-group-properties.svgz
rename to kde/src/icons/user-group-properties.svgz
diff --git a/sflphone-client-kde/src/icons/x-office-address-book.png b/kde/src/icons/x-office-address-book.png
similarity index 100%
rename from sflphone-client-kde/src/icons/x-office-address-book.png
rename to kde/src/icons/x-office-address-book.png
diff --git a/sflphone-client-kde/src/instance_interface_singleton.cpp b/kde/src/instance_interface_singleton.cpp
similarity index 100%
rename from sflphone-client-kde/src/instance_interface_singleton.cpp
rename to kde/src/instance_interface_singleton.cpp
diff --git a/sflphone-client-kde/src/instance_interface_singleton.h b/kde/src/instance_interface_singleton.h
similarity index 100%
rename from sflphone-client-kde/src/instance_interface_singleton.h
rename to kde/src/instance_interface_singleton.h
diff --git a/sflphone-client-kde/src/main.cpp b/kde/src/main.cpp
similarity index 100%
rename from sflphone-client-kde/src/main.cpp
rename to kde/src/main.cpp
diff --git a/sflphone-client-kde/src/qrc/resources.qrc b/kde/src/qrc/resources.qrc
similarity index 100%
rename from sflphone-client-kde/src/qrc/resources.qrc
rename to kde/src/qrc/resources.qrc
diff --git a/sflphone-client-kde/src/sflphone_const.h b/kde/src/sflphone_const.h
similarity index 100%
rename from sflphone-client-kde/src/sflphone_const.h
rename to kde/src/sflphone_const.h
diff --git a/sflphone-client-kde/src/typedefs.h b/kde/src/typedefs.h
similarity index 100%
rename from sflphone-client-kde/src/typedefs.h
rename to kde/src/typedefs.h
diff --git a/sflphone-client-kde/src/ui/SFLPhoneView_base.ui b/kde/src/ui/SFLPhoneView_base.ui
similarity index 100%
rename from sflphone-client-kde/src/ui/SFLPhoneView_base.ui
rename to kde/src/ui/SFLPhoneView_base.ui
diff --git a/sflphone-client-kde/templates/cpp b/kde/templates/cpp
similarity index 100%
rename from sflphone-client-kde/templates/cpp
rename to kde/templates/cpp
diff --git a/sflphone-client-kde/templates/h b/kde/templates/h
similarity index 100%
rename from sflphone-client-kde/templates/h
rename to kde/templates/h
diff --git a/sflphone-client-kde/test.config b/kde/test.config
similarity index 100%
rename from sflphone-client-kde/test.config
rename to kde/test.config
diff --git a/sflphone-plugins/AUTHORS b/plugins/AUTHORS
similarity index 100%
rename from sflphone-plugins/AUTHORS
rename to plugins/AUTHORS
diff --git a/sflphone-plugins/COPYING b/plugins/COPYING
similarity index 100%
rename from sflphone-plugins/COPYING
rename to plugins/COPYING
diff --git a/sflphone-plugins/ChangeLog b/plugins/ChangeLog
similarity index 100%
rename from sflphone-plugins/ChangeLog
rename to plugins/ChangeLog
diff --git a/sflphone-plugins/INSTALL b/plugins/INSTALL
similarity index 100%
rename from sflphone-plugins/INSTALL
rename to plugins/INSTALL
diff --git a/sflphone-plugins/Makefile.am b/plugins/Makefile.am
similarity index 100%
rename from sflphone-plugins/Makefile.am
rename to plugins/Makefile.am
diff --git a/sflphone-plugins/NEWS b/plugins/NEWS
similarity index 100%
rename from sflphone-plugins/NEWS
rename to plugins/NEWS
diff --git a/sflphone-plugins/README b/plugins/README
similarity index 100%
rename from sflphone-plugins/README
rename to plugins/README
diff --git a/sflphone-plugins/VERSION b/plugins/VERSION
similarity index 100%
rename from sflphone-plugins/VERSION
rename to plugins/VERSION
diff --git a/sflphone-plugins/addressbook/Makefile.am b/plugins/addressbook/Makefile.am
similarity index 100%
rename from sflphone-plugins/addressbook/Makefile.am
rename to plugins/addressbook/Makefile.am
diff --git a/sflphone-plugins/addressbook/evolution/Makefile.am b/plugins/addressbook/evolution/Makefile.am
similarity index 100%
rename from sflphone-plugins/addressbook/evolution/Makefile.am
rename to plugins/addressbook/evolution/Makefile.am
diff --git a/sflphone-plugins/addressbook/evolution/addressbook.c b/plugins/addressbook/evolution/addressbook.c
similarity index 100%
rename from sflphone-plugins/addressbook/evolution/addressbook.c
rename to plugins/addressbook/evolution/addressbook.c
diff --git a/sflphone-plugins/addressbook/evolution/addressbook.h b/plugins/addressbook/evolution/addressbook.h
similarity index 100%
rename from sflphone-plugins/addressbook/evolution/addressbook.h
rename to plugins/addressbook/evolution/addressbook.h
diff --git a/sflphone-plugins/addressbook/evolution/eds.c b/plugins/addressbook/evolution/eds.c
similarity index 100%
rename from sflphone-plugins/addressbook/evolution/eds.c
rename to plugins/addressbook/evolution/eds.c
diff --git a/sflphone-plugins/addressbook/evolution/eds.h b/plugins/addressbook/evolution/eds.h
similarity index 100%
rename from sflphone-plugins/addressbook/evolution/eds.h
rename to plugins/addressbook/evolution/eds.h
diff --git a/sflphone-plugins/autogen.sh b/plugins/autogen.sh
similarity index 100%
rename from sflphone-plugins/autogen.sh
rename to plugins/autogen.sh
diff --git a/sflphone-plugins/configure.ac b/plugins/configure.ac
similarity index 100%
rename from sflphone-plugins/configure.ac
rename to plugins/configure.ac
diff --git a/sflphone-plugins/globals.mak b/plugins/globals.mak
similarity index 100%
rename from sflphone-plugins/globals.mak
rename to plugins/globals.mak