diff --git a/daemon/configure.ac b/daemon/configure.ac
index 43dc369e5ce786e59988171301dcc73a9f1853e8..b3e70a27fe5a9f4004267e75c7f7b4c27ee6514a 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -96,10 +96,10 @@ AC_ARG_WITH(contrib,
 ])
 AC_MSG_CHECKING([for 3rd party libraries path])
 AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
-  CONTRIB_DIR="${srcdir}/../contrib/${host}"
+  CONTRIB_DIR="${srcdir}/contrib/${host}"
   AS_IF([test ! -d "${CONTRIB_DIR}"], [
     echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
-    CONTRIB_DIR="${srcdir}/../contrib/`$CC -dumpmachine`"
+    CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
     AS_IF([test ! -d "${CONTRIB_DIR}"], [
       echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
       CONTRIB_DIR=""
diff --git a/contrib/bootstrap b/daemon/contrib/bootstrap
similarity index 100%
rename from contrib/bootstrap
rename to daemon/contrib/bootstrap
diff --git a/contrib/src/README b/daemon/contrib/src/README
similarity index 100%
rename from contrib/src/README
rename to daemon/contrib/src/README
diff --git a/contrib/src/ccrtp/SHA512SUMS b/daemon/contrib/src/ccrtp/SHA512SUMS
similarity index 100%
rename from contrib/src/ccrtp/SHA512SUMS
rename to daemon/contrib/src/ccrtp/SHA512SUMS
diff --git a/contrib/src/ccrtp/rules.mak b/daemon/contrib/src/ccrtp/rules.mak
similarity index 100%
rename from contrib/src/ccrtp/rules.mak
rename to daemon/contrib/src/ccrtp/rules.mak
diff --git a/contrib/src/ccrtp/standardheader.patch b/daemon/contrib/src/ccrtp/standardheader.patch
similarity index 100%
rename from contrib/src/ccrtp/standardheader.patch
rename to daemon/contrib/src/ccrtp/standardheader.patch
diff --git a/contrib/src/change_prefix.sh b/daemon/contrib/src/change_prefix.sh
similarity index 100%
rename from contrib/src/change_prefix.sh
rename to daemon/contrib/src/change_prefix.sh
diff --git a/contrib/src/expat/SHA512SUMS b/daemon/contrib/src/expat/SHA512SUMS
similarity index 100%
rename from contrib/src/expat/SHA512SUMS
rename to daemon/contrib/src/expat/SHA512SUMS
diff --git a/contrib/src/expat/rules.mak b/daemon/contrib/src/expat/rules.mak
similarity index 100%
rename from contrib/src/expat/rules.mak
rename to daemon/contrib/src/expat/rules.mak
diff --git a/contrib/src/flac/SHA512SUMS b/daemon/contrib/src/flac/SHA512SUMS
similarity index 100%
rename from contrib/src/flac/SHA512SUMS
rename to daemon/contrib/src/flac/SHA512SUMS
diff --git a/contrib/src/flac/libFLAC-pc.patch b/daemon/contrib/src/flac/libFLAC-pc.patch
similarity index 100%
rename from contrib/src/flac/libFLAC-pc.patch
rename to daemon/contrib/src/flac/libFLAC-pc.patch
diff --git a/contrib/src/flac/rules.mak b/daemon/contrib/src/flac/rules.mak
similarity index 100%
rename from contrib/src/flac/rules.mak
rename to daemon/contrib/src/flac/rules.mak
diff --git a/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch b/daemon/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch
similarity index 100%
rename from contrib/src/gcrypt/0001-Fix-assembly-division-check.patch
rename to daemon/contrib/src/gcrypt/0001-Fix-assembly-division-check.patch
diff --git a/contrib/src/gcrypt/SHA512SUMS b/daemon/contrib/src/gcrypt/SHA512SUMS
similarity index 100%
rename from contrib/src/gcrypt/SHA512SUMS
rename to daemon/contrib/src/gcrypt/SHA512SUMS
diff --git a/contrib/src/gcrypt/fix-amd64-assembly-on-solaris.patch b/daemon/contrib/src/gcrypt/fix-amd64-assembly-on-solaris.patch
similarity index 100%
rename from contrib/src/gcrypt/fix-amd64-assembly-on-solaris.patch
rename to daemon/contrib/src/gcrypt/fix-amd64-assembly-on-solaris.patch
diff --git a/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch b/daemon/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
similarity index 100%
rename from contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
rename to daemon/contrib/src/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
diff --git a/contrib/src/gcrypt/mpi-darwin13.patch b/daemon/contrib/src/gcrypt/mpi-darwin13.patch
similarity index 100%
rename from contrib/src/gcrypt/mpi-darwin13.patch
rename to daemon/contrib/src/gcrypt/mpi-darwin13.patch
diff --git a/contrib/src/gcrypt/rules.mak b/daemon/contrib/src/gcrypt/rules.mak
similarity index 100%
rename from contrib/src/gcrypt/rules.mak
rename to daemon/contrib/src/gcrypt/rules.mak
diff --git a/contrib/src/get-arch.sh b/daemon/contrib/src/get-arch.sh
similarity index 100%
rename from contrib/src/get-arch.sh
rename to daemon/contrib/src/get-arch.sh
diff --git a/contrib/src/gmp/SHA512SUMS b/daemon/contrib/src/gmp/SHA512SUMS
similarity index 100%
rename from contrib/src/gmp/SHA512SUMS
rename to daemon/contrib/src/gmp/SHA512SUMS
diff --git a/contrib/src/gmp/clang.patch b/daemon/contrib/src/gmp/clang.patch
similarity index 100%
rename from contrib/src/gmp/clang.patch
rename to daemon/contrib/src/gmp/clang.patch
diff --git a/contrib/src/gmp/rules.mak b/daemon/contrib/src/gmp/rules.mak
similarity index 100%
rename from contrib/src/gmp/rules.mak
rename to daemon/contrib/src/gmp/rules.mak
diff --git a/contrib/src/gmp/thumb.patch b/daemon/contrib/src/gmp/thumb.patch
similarity index 100%
rename from contrib/src/gmp/thumb.patch
rename to daemon/contrib/src/gmp/thumb.patch
diff --git a/contrib/src/gnutls/SHA512SUMS b/daemon/contrib/src/gnutls/SHA512SUMS
similarity index 100%
rename from contrib/src/gnutls/SHA512SUMS
rename to daemon/contrib/src/gnutls/SHA512SUMS
diff --git a/contrib/src/gnutls/downgrade-automake-requirement.patch b/daemon/contrib/src/gnutls/downgrade-automake-requirement.patch
similarity index 100%
rename from contrib/src/gnutls/downgrade-automake-requirement.patch
rename to daemon/contrib/src/gnutls/downgrade-automake-requirement.patch
diff --git a/contrib/src/gnutls/gnutls-no-egd.patch b/daemon/contrib/src/gnutls/gnutls-no-egd.patch
similarity index 100%
rename from contrib/src/gnutls/gnutls-no-egd.patch
rename to daemon/contrib/src/gnutls/gnutls-no-egd.patch
diff --git a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch b/daemon/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
similarity index 100%
rename from contrib/src/gnutls/gnutls-pkgconfig-osx.patch
rename to daemon/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
diff --git a/contrib/src/gnutls/gnutls-win32.patch b/daemon/contrib/src/gnutls/gnutls-win32.patch
similarity index 100%
rename from contrib/src/gnutls/gnutls-win32.patch
rename to daemon/contrib/src/gnutls/gnutls-win32.patch
diff --git a/contrib/src/gnutls/mac-keychain-lookup.patch b/daemon/contrib/src/gnutls/mac-keychain-lookup.patch
similarity index 100%
rename from contrib/src/gnutls/mac-keychain-lookup.patch
rename to daemon/contrib/src/gnutls/mac-keychain-lookup.patch
diff --git a/contrib/src/gnutls/no-create-time-h.patch b/daemon/contrib/src/gnutls/no-create-time-h.patch
similarity index 100%
rename from contrib/src/gnutls/no-create-time-h.patch
rename to daemon/contrib/src/gnutls/no-create-time-h.patch
diff --git a/contrib/src/gnutls/read-file-limits.h.patch b/daemon/contrib/src/gnutls/read-file-limits.h.patch
similarity index 100%
rename from contrib/src/gnutls/read-file-limits.h.patch
rename to daemon/contrib/src/gnutls/read-file-limits.h.patch
diff --git a/contrib/src/gnutls/rules.mak b/daemon/contrib/src/gnutls/rules.mak
similarity index 100%
rename from contrib/src/gnutls/rules.mak
rename to daemon/contrib/src/gnutls/rules.mak
diff --git a/contrib/src/gpgerror/SHA512SUMS b/daemon/contrib/src/gpgerror/SHA512SUMS
similarity index 100%
rename from contrib/src/gpgerror/SHA512SUMS
rename to daemon/contrib/src/gpgerror/SHA512SUMS
diff --git a/contrib/src/gpgerror/rules.mak b/daemon/contrib/src/gpgerror/rules.mak
similarity index 100%
rename from contrib/src/gpgerror/rules.mak
rename to daemon/contrib/src/gpgerror/rules.mak
diff --git a/contrib/src/gsm/SHA512SUMS b/daemon/contrib/src/gsm/SHA512SUMS
similarity index 100%
rename from contrib/src/gsm/SHA512SUMS
rename to daemon/contrib/src/gsm/SHA512SUMS
diff --git a/contrib/src/gsm/gsm-cross.patch b/daemon/contrib/src/gsm/gsm-cross.patch
similarity index 100%
rename from contrib/src/gsm/gsm-cross.patch
rename to daemon/contrib/src/gsm/gsm-cross.patch
diff --git a/contrib/src/gsm/rules.mak b/daemon/contrib/src/gsm/rules.mak
similarity index 100%
rename from contrib/src/gsm/rules.mak
rename to daemon/contrib/src/gsm/rules.mak
diff --git a/contrib/src/iax/rules.mak b/daemon/contrib/src/iax/rules.mak
similarity index 100%
rename from contrib/src/iax/rules.mak
rename to daemon/contrib/src/iax/rules.mak
diff --git a/contrib/src/libav/rules.mak b/daemon/contrib/src/libav/rules.mak
similarity index 100%
rename from contrib/src/libav/rules.mak
rename to daemon/contrib/src/libav/rules.mak
diff --git a/contrib/src/main.mak b/daemon/contrib/src/main.mak
similarity index 100%
rename from contrib/src/main.mak
rename to daemon/contrib/src/main.mak
diff --git a/contrib/src/nettle/SHA512SUMS b/daemon/contrib/src/nettle/SHA512SUMS
similarity index 100%
rename from contrib/src/nettle/SHA512SUMS
rename to daemon/contrib/src/nettle/SHA512SUMS
diff --git a/contrib/src/nettle/rules.mak b/daemon/contrib/src/nettle/rules.mak
similarity index 100%
rename from contrib/src/nettle/rules.mak
rename to daemon/contrib/src/nettle/rules.mak
diff --git a/contrib/src/ogg/SHA512SUMS b/daemon/contrib/src/ogg/SHA512SUMS
similarity index 100%
rename from contrib/src/ogg/SHA512SUMS
rename to daemon/contrib/src/ogg/SHA512SUMS
diff --git a/contrib/src/ogg/libogg-1.1.patch b/daemon/contrib/src/ogg/libogg-1.1.patch
similarity index 100%
rename from contrib/src/ogg/libogg-1.1.patch
rename to daemon/contrib/src/ogg/libogg-1.1.patch
diff --git a/contrib/src/ogg/libogg-disable-check.patch b/daemon/contrib/src/ogg/libogg-disable-check.patch
similarity index 100%
rename from contrib/src/ogg/libogg-disable-check.patch
rename to daemon/contrib/src/ogg/libogg-disable-check.patch
diff --git a/contrib/src/ogg/rules.mak b/daemon/contrib/src/ogg/rules.mak
similarity index 100%
rename from contrib/src/ogg/rules.mak
rename to daemon/contrib/src/ogg/rules.mak
diff --git a/contrib/src/opus/SHA512SUMS b/daemon/contrib/src/opus/SHA512SUMS
similarity index 100%
rename from contrib/src/opus/SHA512SUMS
rename to daemon/contrib/src/opus/SHA512SUMS
diff --git a/contrib/src/opus/rules.mak b/daemon/contrib/src/opus/rules.mak
similarity index 100%
rename from contrib/src/opus/rules.mak
rename to daemon/contrib/src/opus/rules.mak
diff --git a/contrib/src/pcre/SHA512SUMS b/daemon/contrib/src/pcre/SHA512SUMS
similarity index 100%
rename from contrib/src/pcre/SHA512SUMS
rename to daemon/contrib/src/pcre/SHA512SUMS
diff --git a/contrib/src/pcre/rules.mak b/daemon/contrib/src/pcre/rules.mak
similarity index 100%
rename from contrib/src/pcre/rules.mak
rename to daemon/contrib/src/pcre/rules.mak
diff --git a/contrib/src/pjproject/SHA512SUMS b/daemon/contrib/src/pjproject/SHA512SUMS
similarity index 100%
rename from contrib/src/pjproject/SHA512SUMS
rename to daemon/contrib/src/pjproject/SHA512SUMS
diff --git a/contrib/src/pjproject/aconfigureupdate.patch b/daemon/contrib/src/pjproject/aconfigureupdate.patch
similarity index 100%
rename from contrib/src/pjproject/aconfigureupdate.patch
rename to daemon/contrib/src/pjproject/aconfigureupdate.patch
diff --git a/contrib/src/pjproject/endianness.patch b/daemon/contrib/src/pjproject/endianness.patch
similarity index 100%
rename from contrib/src/pjproject/endianness.patch
rename to daemon/contrib/src/pjproject/endianness.patch
diff --git a/contrib/src/pjproject/gnutls.patch b/daemon/contrib/src/pjproject/gnutls.patch
similarity index 100%
rename from contrib/src/pjproject/gnutls.patch
rename to daemon/contrib/src/pjproject/gnutls.patch
diff --git a/contrib/src/pjproject/ipv6.patch b/daemon/contrib/src/pjproject/ipv6.patch
similarity index 100%
rename from contrib/src/pjproject/ipv6.patch
rename to daemon/contrib/src/pjproject/ipv6.patch
diff --git a/contrib/src/pjproject/notestsapps.patch b/daemon/contrib/src/pjproject/notestsapps.patch
similarity index 100%
rename from contrib/src/pjproject/notestsapps.patch
rename to daemon/contrib/src/pjproject/notestsapps.patch
diff --git a/contrib/src/pjproject/rules.mak b/daemon/contrib/src/pjproject/rules.mak
similarity index 100%
rename from contrib/src/pjproject/rules.mak
rename to daemon/contrib/src/pjproject/rules.mak
diff --git a/contrib/src/pjproject/unknowncipher.patch b/daemon/contrib/src/pjproject/unknowncipher.patch
similarity index 100%
rename from contrib/src/pjproject/unknowncipher.patch
rename to daemon/contrib/src/pjproject/unknowncipher.patch
diff --git a/contrib/src/pkg-static.sh b/daemon/contrib/src/pkg-static.sh
similarity index 100%
rename from contrib/src/pkg-static.sh
rename to daemon/contrib/src/pkg-static.sh
diff --git a/contrib/src/samplerate/SHA512SUMS b/daemon/contrib/src/samplerate/SHA512SUMS
similarity index 100%
rename from contrib/src/samplerate/SHA512SUMS
rename to daemon/contrib/src/samplerate/SHA512SUMS
diff --git a/contrib/src/samplerate/carbon.patch b/daemon/contrib/src/samplerate/carbon.patch
similarity index 100%
rename from contrib/src/samplerate/carbon.patch
rename to daemon/contrib/src/samplerate/carbon.patch
diff --git a/contrib/src/samplerate/rules.mak b/daemon/contrib/src/samplerate/rules.mak
similarity index 100%
rename from contrib/src/samplerate/rules.mak
rename to daemon/contrib/src/samplerate/rules.mak
diff --git a/contrib/src/samplerate/soundcard.patch b/daemon/contrib/src/samplerate/soundcard.patch
similarity index 100%
rename from contrib/src/samplerate/soundcard.patch
rename to daemon/contrib/src/samplerate/soundcard.patch
diff --git a/contrib/src/sndfile/SHA512SUMS b/daemon/contrib/src/sndfile/SHA512SUMS
similarity index 100%
rename from contrib/src/sndfile/SHA512SUMS
rename to daemon/contrib/src/sndfile/SHA512SUMS
diff --git a/contrib/src/sndfile/carbon.patch b/daemon/contrib/src/sndfile/carbon.patch
similarity index 100%
rename from contrib/src/sndfile/carbon.patch
rename to daemon/contrib/src/sndfile/carbon.patch
diff --git a/contrib/src/sndfile/rules.mak b/daemon/contrib/src/sndfile/rules.mak
similarity index 100%
rename from contrib/src/sndfile/rules.mak
rename to daemon/contrib/src/sndfile/rules.mak
diff --git a/contrib/src/sndfile/soundcard.patch b/daemon/contrib/src/sndfile/soundcard.patch
similarity index 100%
rename from contrib/src/sndfile/soundcard.patch
rename to daemon/contrib/src/sndfile/soundcard.patch
diff --git a/contrib/src/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch b/daemon/contrib/src/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch
similarity index 100%
rename from contrib/src/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch
rename to daemon/contrib/src/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch
diff --git a/contrib/src/speex/rules.mak b/daemon/contrib/src/speex/rules.mak
similarity index 100%
rename from contrib/src/speex/rules.mak
rename to daemon/contrib/src/speex/rules.mak
diff --git a/contrib/src/speexdsp/rules.mak b/daemon/contrib/src/speexdsp/rules.mak
similarity index 100%
rename from contrib/src/speexdsp/rules.mak
rename to daemon/contrib/src/speexdsp/rules.mak
diff --git a/contrib/src/ucommon/SHA512SUMS b/daemon/contrib/src/ucommon/SHA512SUMS
similarity index 100%
rename from contrib/src/ucommon/SHA512SUMS
rename to daemon/contrib/src/ucommon/SHA512SUMS
diff --git a/contrib/src/ucommon/extended.patch b/daemon/contrib/src/ucommon/extended.patch
similarity index 100%
rename from contrib/src/ucommon/extended.patch
rename to daemon/contrib/src/ucommon/extended.patch
diff --git a/contrib/src/ucommon/rules.mak b/daemon/contrib/src/ucommon/rules.mak
similarity index 100%
rename from contrib/src/ucommon/rules.mak
rename to daemon/contrib/src/ucommon/rules.mak
diff --git a/contrib/src/ucommon/usedefines.patch b/daemon/contrib/src/ucommon/usedefines.patch
similarity index 100%
rename from contrib/src/ucommon/usedefines.patch
rename to daemon/contrib/src/ucommon/usedefines.patch
diff --git a/contrib/src/uuid/SHA512SUMS b/daemon/contrib/src/uuid/SHA512SUMS
similarity index 100%
rename from contrib/src/uuid/SHA512SUMS
rename to daemon/contrib/src/uuid/SHA512SUMS
diff --git a/contrib/src/uuid/android.patch b/daemon/contrib/src/uuid/android.patch
similarity index 100%
rename from contrib/src/uuid/android.patch
rename to daemon/contrib/src/uuid/android.patch
diff --git a/contrib/src/uuid/rules.mak b/daemon/contrib/src/uuid/rules.mak
similarity index 100%
rename from contrib/src/uuid/rules.mak
rename to daemon/contrib/src/uuid/rules.mak
diff --git a/contrib/src/vorbis/SHA512SUMS b/daemon/contrib/src/vorbis/SHA512SUMS
similarity index 100%
rename from contrib/src/vorbis/SHA512SUMS
rename to daemon/contrib/src/vorbis/SHA512SUMS
diff --git a/contrib/src/vorbis/osx.patch b/daemon/contrib/src/vorbis/osx.patch
similarity index 100%
rename from contrib/src/vorbis/osx.patch
rename to daemon/contrib/src/vorbis/osx.patch
diff --git a/contrib/src/vorbis/rules.mak b/daemon/contrib/src/vorbis/rules.mak
similarity index 100%
rename from contrib/src/vorbis/rules.mak
rename to daemon/contrib/src/vorbis/rules.mak
diff --git a/contrib/src/vpx/SHA512SUMS b/daemon/contrib/src/vpx/SHA512SUMS
similarity index 100%
rename from contrib/src/vpx/SHA512SUMS
rename to daemon/contrib/src/vpx/SHA512SUMS
diff --git a/contrib/src/vpx/libvpx-mac.patch b/daemon/contrib/src/vpx/libvpx-mac.patch
similarity index 100%
rename from contrib/src/vpx/libvpx-mac.patch
rename to daemon/contrib/src/vpx/libvpx-mac.patch
diff --git a/contrib/src/vpx/libvpx-no-cross.patch b/daemon/contrib/src/vpx/libvpx-no-cross.patch
similarity index 100%
rename from contrib/src/vpx/libvpx-no-cross.patch
rename to daemon/contrib/src/vpx/libvpx-no-cross.patch
diff --git a/contrib/src/vpx/libvpx-sysroot.patch b/daemon/contrib/src/vpx/libvpx-sysroot.patch
similarity index 100%
rename from contrib/src/vpx/libvpx-sysroot.patch
rename to daemon/contrib/src/vpx/libvpx-sysroot.patch
diff --git a/contrib/src/vpx/rules.mak b/daemon/contrib/src/vpx/rules.mak
similarity index 100%
rename from contrib/src/vpx/rules.mak
rename to daemon/contrib/src/vpx/rules.mak
diff --git a/contrib/src/x264/rules.mak b/daemon/contrib/src/x264/rules.mak
similarity index 100%
rename from contrib/src/x264/rules.mak
rename to daemon/contrib/src/x264/rules.mak
diff --git a/contrib/src/yaml/SHA512SUMS b/daemon/contrib/src/yaml/SHA512SUMS
similarity index 100%
rename from contrib/src/yaml/SHA512SUMS
rename to daemon/contrib/src/yaml/SHA512SUMS
diff --git a/contrib/src/yaml/rules.mak b/daemon/contrib/src/yaml/rules.mak
similarity index 100%
rename from contrib/src/yaml/rules.mak
rename to daemon/contrib/src/yaml/rules.mak
diff --git a/contrib/src/zlib/SHA512SUMS b/daemon/contrib/src/zlib/SHA512SUMS
similarity index 100%
rename from contrib/src/zlib/SHA512SUMS
rename to daemon/contrib/src/zlib/SHA512SUMS
diff --git a/contrib/src/zlib/rules.mak b/daemon/contrib/src/zlib/rules.mak
similarity index 100%
rename from contrib/src/zlib/rules.mak
rename to daemon/contrib/src/zlib/rules.mak
diff --git a/contrib/src/zrtpcpp/SHA512SUMS b/daemon/contrib/src/zrtpcpp/SHA512SUMS
similarity index 100%
rename from contrib/src/zrtpcpp/SHA512SUMS
rename to daemon/contrib/src/zrtpcpp/SHA512SUMS
diff --git a/contrib/src/zrtpcpp/forcegcrypt.patch b/daemon/contrib/src/zrtpcpp/forcegcrypt.patch
similarity index 100%
rename from contrib/src/zrtpcpp/forcegcrypt.patch
rename to daemon/contrib/src/zrtpcpp/forcegcrypt.patch
diff --git a/contrib/src/zrtpcpp/nodemo.patch b/daemon/contrib/src/zrtpcpp/nodemo.patch
similarity index 100%
rename from contrib/src/zrtpcpp/nodemo.patch
rename to daemon/contrib/src/zrtpcpp/nodemo.patch
diff --git a/contrib/src/zrtpcpp/rules.mak b/daemon/contrib/src/zrtpcpp/rules.mak
similarity index 100%
rename from contrib/src/zrtpcpp/rules.mak
rename to daemon/contrib/src/zrtpcpp/rules.mak
diff --git a/contrib/src/zrtpcpp/standardheader.patch b/daemon/contrib/src/zrtpcpp/standardheader.patch
similarity index 100%
rename from contrib/src/zrtpcpp/standardheader.patch
rename to daemon/contrib/src/zrtpcpp/standardheader.patch
diff --git a/contrib/src/zrtpcpp/threadcbsupdate.patch b/daemon/contrib/src/zrtpcpp/threadcbsupdate.patch
similarity index 100%
rename from contrib/src/zrtpcpp/threadcbsupdate.patch
rename to daemon/contrib/src/zrtpcpp/threadcbsupdate.patch
diff --git a/contrib/tarballs/.gitignore b/daemon/contrib/tarballs/.gitignore
similarity index 100%
rename from contrib/tarballs/.gitignore
rename to daemon/contrib/tarballs/.gitignore
diff --git a/tools/build-system/hudson-sflphone-script.sh b/tools/build-system/hudson-sflphone-script.sh
index be49d7becdbe956dff307ee95a21500f21704c2a..dab2378951c0a09302a877ea21d14b4d1754aead 100755
--- a/tools/build-system/hudson-sflphone-script.sh
+++ b/tools/build-system/hudson-sflphone-script.sh
@@ -126,10 +126,11 @@ function build_contrib {
 }
 
 function build_daemon {
+    pushd daemon
+
     # Build dependencies first
     build_contrib
 
-    pushd daemon
     # Run static analysis code tool
     if [ $CODE_ANALYSIS == 1 ]; then
         run_code_analysis