diff --git a/conf.d/heartbeat.conf.sample b/conf.d/heartbeat.conf.sample
new file mode 100644
index 00000000..2090f16e
--- /dev/null
+++ b/conf.d/heartbeat.conf.sample
@@ -0,0 +1,43 @@
+[general]
+; This section sets global variables of the implementation
+
+; enabled: bool: Enable operation of this module
+;enabled=true
+
+; node: string: Name of this cluster node, must be set to enable module
+;node=
+
+; host: ipaddress: IP address to send heartbeat packets to, must be set
+;host=
+
+; port: int: UDP destination port number to send heartbeat packets
+;port=694
+
+; broadcast: bool: Attempt to enable broadcast packet delivery
+;broadcast=true
+
+; ttl: int: TTL included in heartbeat packets
+;ttl=2
+
+
+[authentication]
+; Control on how we authenticate to other Linux-HA daemons
+
+; index: int: Index of authentication key in the remote authkeys file
+;index=
+
+; method: keyword: Authentication method, one of: crc, md5, sha1
+;method=
+
+; key: string: Authentication key (secret) for md5 and sha1 methods
+;key=
+
+
+[priorities]
+; Entries in this section set the priority of each handler in engine's chain
+
+: engine.timer: int: Priority of "engine.timer" handler
+;engine.timer=150
+
+: engine.halt: int: Priority of "engine.halt" handler
+;engine.halt=50
diff --git a/conf.d/mgcpca.conf.sample b/conf.d/mgcpca.conf.sample
new file mode 100644
index 00000000..b7951cc0
--- /dev/null
+++ b/conf.d/mgcpca.conf.sample
@@ -0,0 +1,47 @@
+[general]
+; This section sets global variables of the MGCP Call Agent module
+
+; priority: int: Priority of the chan.rtp message handler
+;priority=80
+
+
+[engine]
+; These parameters are used to initialize the MGCP Engine
+
+; enabled: bool: Enable the MGCP engine
+;enabled=yes
+
+; address: ipaddress: Local IP address to bind to, default all interfaces
+;address=0.0.0.0
+
+; UDP port to bind, set to zero to use default MGCP CA port (2727)
+;port=
+
+
+[endpoint]
+; Settings for the local endpoint
+
+; user: string: The user part of the local endpoint
+;user=yate
+
+; host: string: The host part of the local endpoint, default engine's address
+;host=
+
+; port: int: Declared local port, defaults to engine's port
+;port=
+
+
+[gw PUT_NAME_HERE]
+; One fw ... section is required for each gateway we control
+
+; user: string: Remote MGCP resource name
+;user=
+
+; host: ipaddress: IP address of the gateway, mandatory
+;host=
+
+; port: int: Remote port to send packets to
+;port=2427
+
+; default: bool: This is the default gateway to send commands to
+;default=no
diff --git a/conf.d/mgcpgw.conf.sample b/conf.d/mgcpgw.conf.sample
new file mode 100644
index 00000000..11e1c197
--- /dev/null
+++ b/conf.d/mgcpgw.conf.sample
@@ -0,0 +1,38 @@
+[general]
+; This section sets global variables of the MGCP Gateway module
+
+; standby: bool: Enter standby mode initially
+;standby=no
+
+
+[engine]
+; These parameters are used to initialize the MGCP Engine
+
+; enabled: bool: Enable the MGCP engine
+;enabled=yes
+
+; address: ipaddress: Local IP address to bind to, default all interfaces
+;address=0.0.0.0
+
+; UDP port to bind, set to zero to use default MGCP GW port (2427)
+;port=
+
+
+[ep PUT_NAME_HERE]
+; One ep ... section is required for each of our endpoints
+; Each endpoint can be associated with at most one Call Agent
+
+; local_user: string: The user part of the local endpoint, default endpoint name
+;local_user=
+
+; local_host: string: The host part of the local endpoint, default engine's address
+;local_host=
+
+; local_port: int: Declared local port, defaults to engine's port
+;local_port=
+
+; remote_host: string: The host part of the remote endpoint, required
+;remote_host=
+
+; remote_port: int: Declared remote port, use MGCP default if not set or zero
+;remote_port=
diff --git a/configure.in b/configure.in
index dda2edec..151b1f58 100644
--- a/configure.in
+++ b/configure.in
@@ -214,21 +214,6 @@ esac
 AC_MSG_RESULT([$INTERNAL_REGEX])
 AC_SUBST(INTERNAL_REGEX)
 
-HAVE_PRI=no
-HAVE_PRI_CB=no
-AC_ARG_WITH(libpri,AC_HELP_STRING([--with-libpri],[use ISDN PRI if available (default)]),[ac_cv_use_libpri=$withval],[ac_cv_use_libpri=yes])
-if [[ "x$ac_cv_use_libpri" != "xno" ]]; then
-AC_CHECK_HEADER(libpri.h, , [ac_cv_use_libpri=no])
-fi
-if [[ "x$ac_cv_use_libpri" != "xno" ]]; then
-AC_CHECK_LIB([pri], [pri_new], [HAVE_PRI=yes])
-if [[ "x$HAVE_PRI" = "xyes" ]]; then
-AC_CHECK_LIB([pri], [pri_new_cb], [HAVE_PRI_CB=yes])
-fi
-fi
-AC_SUBST(HAVE_PRI)
-AC_SUBST(HAVE_PRI_CB)
-
 HAVE_PGSQL=no
 PGSQL_INC=""
 AC_ARG_WITH(libpq,AC_HELP_STRING([--with-libpq=DIR],[use Postgress SQL from DIR (default /usr)]),[ac_cv_use_libpq=$withval],[ac_cv_use_libpq=/usr])
@@ -419,9 +404,9 @@ HAVE_ILBC=no
 ILBC_INC=""
 AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),want_ilbc=$enableval,want_ilbc=yes)
 if [[ "x$want_ilbc" = "xyes" ]]; then
-AC_MSG_CHECKING([for iLBC in contrib])
+AC_MSG_CHECKING([for iLBC in libs])
 	basedir=`cd "$srcdir" && pwd`
-	incilbc="contrib/ilbc"
+	incilbc="libs/ilbc"
         if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
 		HAVE_ILBC=yes
 		ILBC_INC="-I$basedir/$incilbc"
diff --git a/modules/Makefile.in b/modules/Makefile.in
index b6650cdb..44087b0c 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -35,6 +35,9 @@ PROGS := cdrbuild.yate cdrfile.yate regexroute.yate \
 	server/regfile.yate server/accfile.yate server/register.yate \
 	server/yradius.yate \
 	server/sipfeatures.yate \
+	server/heartbeat.yate \
+	server/mgcpgw.yate server/mgcpca.yate \
+	server/mrcpspeech.yate \
 	callgen.yate analyzer.yate rmanager.yate msgsniff.yate
 LIBS :=
 
@@ -58,12 +61,12 @@ ifneq (@HAVE_ALSA@,no)
 PROGS := $(PROGS) client/alsachan.yate
 endif
 
-ifeq (@HAVE_PRI@_@HAVE_ZAP@,yes_yes)
-PROGS := $(PROGS) zapchan.yate
+ifneq (@HAVE_ZAP@,no)
+#PROGS := $(PROGS) server/zapcard.yate
 endif
 
-ifeq (@HAVE_PRI_CB@_@HAVE_WANPIPE@,yes_yes)
-PROGS := $(PROGS) wpchan.yate
+ifeq (@HAVE_WANPIPE@,no)
+#PROGS := $(PROGS) server/wpcard.yate
 endif
 
 ifneq (@HAVE_SPANDSP@,no)
@@ -176,17 +179,9 @@ lib%.so: %.o
 
 # Take special care of the modules that depend on optional libs
 
-zapchan.yate: libypri.o
-zapchan.yate: LOCALFLAGS = @ZAP_FLAGS@
-zapchan.yate: LOCALLIBS = libypri.o -lpri
-
-wpchan.yate: libypri.o
-wpchan.yate: LOCALFLAGS = @WANPIPE_HWEC_INC@
-wpchan.yate: LOCALLIBS = libypri.o -lpri
-
-ysigchan.yate wpcard.yate zapcard.yate: ../libyatess7.so
-ysigchan.yate wpcard.yate zapcard.yate: LOCALFLAGS = -I../libs/yss7
-ysigchan.yate wpcard.yate zapcard.yate: LOCALLIBS = -lyatess7
+server/ysigchan.yate server/wpcard.yate server/zapcard.yate: ../libyatesig.so
+server/ysigchan.yate server/wpcard.yate server/zapcard.yate: LOCALFLAGS = -I../libs/ysig
+server/ysigchan.yate server/wpcard.yate server/zapcard.yate: LOCALLIBS = -lyatesig
 
 h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
 h323chan.yate: LOCALLIBS = @H323_LIB@
@@ -213,6 +208,10 @@ server/dbpbx.yate server/pbxassist.yate: ../libs/ypbx/libyatepbx.a
 server/dbpbx.yate server/pbxassist.yate: LOCALFLAGS = -I@top_srcdir@/libs/ypbx
 server/dbpbx.yate server/pbxassist.yate: LOCALLIBS = ../libs/ypbx/libyatepbx.a
 
+server/mgcpgw.yate server/mgcpca.yate: ../libs/ymgcp/libyatemgcp.a
+server/mgcpgw.yate server/mgcpca.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymgcp
+server/mgcpgw.yate server/mgcpca.yate: LOCALLIBS = ../libs/ymgcp/libyatemgcp.a
+
 ilbccodec.yate: ../libs/ilbc/libilbc.a
 ilbccodec.yate: LOCALLIBS = ../libs/ilbc/libilbc.a
 ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
@@ -242,10 +241,10 @@ gtk2/gtk2mozilla.yate: MODFLAGS = $(MODRELAX)
 rmanager.yate: LOCALFLAGS = $(COREDUMP_INC)
 rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
 
-../libyatess7.so:
-	$(MAKE) -C ../libs/yss7
-../libs/yss7/libyatess7.a:
-	$(MAKE) -C ../libs/yss7
+../libyatesig.so:
+	$(MAKE) -C ../libs/ysig
+../libs/ysig/libyatesig.a:
+	$(MAKE) -C ../libs/ysig
 
 ../libs/ilbc/libilbc.a:
 	$(MAKE) -C ../libs/ilbc
@@ -259,6 +258,9 @@ rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
 ../libs/yiax/libyateiax.a:
 	$(MAKE) -C ../libs/yiax
 
+../libs/ymgcp/libyatemgcp.a:
+	$(MAKE) -C ../libs/ymgcp
+
 ../libs/yxml/libyatexml.a:
 	$(MAKE) -C ../libs/yxml
 
diff --git a/modules/ilbccodec.cpp b/modules/ilbccodec.cpp
index ffda36a3..6cf39d43 100644
--- a/modules/ilbccodec.cpp
+++ b/modules/ilbccodec.cpp
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 
 extern "C" {
-#include "../contrib/ilbc/iLBC_encode.h"
-#include "../contrib/ilbc/iLBC_decode.h"
+#include "../libs/ilbc/iLBC_encode.h"
+#include "../libs/ilbc/iLBC_decode.h"
 }
 
 using namespace TelEngine;
diff --git a/modules/wpcard.cpp b/modules/server/wpcard.cpp
similarity index 100%
rename from modules/wpcard.cpp
rename to modules/server/wpcard.cpp
diff --git a/modules/ysigchan.cpp b/modules/server/ysigchan.cpp
similarity index 100%
rename from modules/ysigchan.cpp
rename to modules/server/ysigchan.cpp
diff --git a/modules/zapcard.cpp b/modules/server/zapcard.cpp
similarity index 100%
rename from modules/zapcard.cpp
rename to modules/server/zapcard.cpp