--- a/configure.ac
+++ b/configure.ac
@@ -10,10 +10,10 @@
 
 AC_INIT(autogen.sh)
 
-VERSION="2.99.2"
+VERSION="3.0.0"
 LT_VERSION="3:0:0"
 
-UCOMMON_REQUIRES="6.0.0"
+UCOMMON_REQUIRES="4.0.0"
 BUILD_SUBDIRS=""
 
 AC_CONFIG_AUX_DIR(autoconf)
@@ -26,7 +26,7 @@
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AM_INIT_AUTOMAKE(bayonne, [$VERSION])
-AM_CONFIG_HEADER(bayonne-config.h)
+AM_CONFIG_HEADER(config.h)
 
 AC_C_RESTRICT
 AC_C_VOLATILE
@@ -62,7 +62,7 @@
 
 test -z "$ac_with_malloc" && ac_with_malloc=""
 test -z "$plugindir" && plugindir='${libdir}'
-test -z "$scriptdir" && scriptdir='${datadir}/bayonne'
+test -z "$scriptdir" && scriptdir='${sysconfdir}/bayonne.d'
 
 AC_DEFUN([AC_SUBST_DIR], [
     ifelse($2,,,$1="[$]$2")
@@ -102,26 +102,6 @@
 )
 if test "$ac_cv_libc_sigwait2" = "yes" ; then
     AC_DEFINE(HAVE_SIGWAIT2, [1], [2 argument form])
-    AC_DEFINE(HAVE_SIGWAIT, [1], [have sigwait])
-else
-    AC_CACHE_CHECK(whether has any sigwait support,
-        ac_cv_libc_sigwait,
-        AC_TRY_COMPILE([
-            #define _POSIX_PTHREAD_SEMANTICS
-            #define _GNU_SOURCE
-            #include <stdio.h>
-            #include <signal.h>],
-            [sigset_t sigs; int signo = sigwait(&sigs);],
-            ac_cv_libc_sigwait2=yes,
-            ac_cv_libc_sigwait2=no
-        )
-    )
-
-    if test "$ac_cv_libc_sigwait" = "yes" ; then
-        AC_DEFINE(HAVE_SIGWAIT, [1], [have sigwait])
-    else
-        AC_CHECK_FUNCS(sigwait)
-    fi
 fi
 
 # lets check init path
@@ -158,37 +138,10 @@
 if test "$UCOMMON_MODEL" = "CC" ; then
     LIBTOOL='$(SHELL) $(top_srcdir)/cmodel.sh'" ${LIBTOOL}" ; fi
 
-AC_CHECK_HEADERS(sys/resource.h pwd.h endian.h math.h stdint.h termios.h ioctl.h sys/ioctl.h sys/inotify.h sys/poll.h sys/uio.h)
+AC_CHECK_HEADERS(sys/resource.h pwd.h)
 AC_CHECK_FUNCS(setrlimit setpgrp setrlimit getuid mkfifo sigwait)
 
-AC_CHECK_HEADER(gsm/gsm.h, [
-    ac_gsm_codec=true
-    AC_DEFINE(HAVE_GSM_GSM_H, [1], [gsm header found])
-    EXPORT_LIBS="$EXPORT_LIBS -lgsm"
-],[
-    AC_CHECK_HEADER(gsm.h, [
-        EXPORT_LIBS="$EXPORT_LIBS -lgsm"
-        AC_DEFINE(HAVE_GSM_H, [1], [gsm default header])
-    ])
-])
-
-AC_ARG_ENABLE(speex, [ --disable-speex          disable speex support])
-if test "$enable_speex" != "no" ; then
-    AC_CHECK_HEADER(speex/speex.h, [
-        AC_CHECK_LIB(speex, speex_encode_int, [
-            AC_DEFINE(HAVE_SPEEX_SPEEX_H, [1], [speex codec support])
-            EXPORT_LIBS="$EXPORT_LIBS -lspeex"
-        ])
-    ])
-fi
-
-AC_CHECK_LIB([m], [sqrt], [EXPORT_LIBS="$EXPORT_LIBS -lm"])
-
-#AC_LANG(C++)
-#AC_CHECK_HEADER(vpbapi.h, [has_vpbapi="yes"],[has_vpbapi="no"])
-#AC_LANG(C)
-
-#AC_CHECK_HEADER(capi20.h, [has_capi20="yes"],[has_capi20="no"])
+AC_CHECK_HEADER(vpbapi.h, [has_vpbapi="yes"],[has_vpbapi="no"])
 
 PKG_CHECK_MODULES(EXOSIP2, eXosip2 >= 3.0.0, [
     has_eXosip2="yes"
@@ -216,17 +169,9 @@
     ])
 ])
 
-PKG_CHECK_MODULES(ORTP, ortp >= 0.20.0,
-    [has_ortp="yes"], [has_ortp="no"])
-
-if test x"$has_ortp" = "xyes" ; then
-    ORTP_FLAGS="$ORTP_CFLAGS"
-    ORTP_LIBS="$ORTP_LIBS"
-    if test x"$has_eXosip2" = "xyes" ; then
-        BUILD_SUBDIRS="$BUILD_SUBDIRS sipwitch" ; fi
-fi
-
 if test x"$has_eXosip2" = "xyes" ; then
+    BUILD_SUBDIRS="$BUILD_SUBDIRS exosip2"
+
     PKG_CHECK_MODULES(LIBOSIP2, libosip2 >= 3.0.0)
     AC_DEFINE(OSIP2_LIST_PTR, [&], [define pointer mode])
     EXOSIP2_LIBS="$EXOSIP2_LIBS $LIBOSIP2_LIBS"
@@ -237,6 +182,14 @@
         EXOSIP2_LIBS="$EXOSIP2_LIBS -liphlpapi -ldnsapi"
         ;;
     esac
+fi
+
+if test x"$has_vpbapi" = "xyes" ; then
+    BUILD_SUBDIRS="$BUILD_SUBDIRS vpbapi" ; fi
+
+if test -z "$BUILD_SUBDIRS" ; then
+    AC_ERROR([no buildable targets.  Stopped])
+    exit 1
 fi
 
 AC_LANG_CPLUSPLUS
@@ -300,11 +253,12 @@
     ;;
 esac
 
-AC_DEFINE_UNQUOTED(BAYONNE_CFGPATH, "$default_cfgpath/bayonne", [config path])
-AC_DEFINE_UNQUOTED(BAYONNE_LIBEXEC, "$default_libexec/bayonne", [script path])
-AC_DEFINE_UNQUOTED(DEFAULT_LIBPATH, "$default_libpath", [default libs])
-AC_DEFINE_UNQUOTED(DEFAULT_DATADIR, "$default_datadir", [default data])
-AC_DEFINE_UNQUOTED(DEFAULT_VARPATH, "$default_varpath", [default varpath])
+AC_DEFINE_UNQUOTED(DEFAULT_SCRPATH, "$default_scrpath", [script path])
+AC_DEFINE_UNQUOTED(DEFAULT_CFGPATH, "$default_cfgpath", [config path])
+AC_DEFINE_UNQUOTED(DEFAULT_VARPATH, "$default_varpath", [run path])
+AC_DEFINE_UNQUOTED(DEFAULT_LIBPATH, "$default_libpath", [lib path])
+AC_DEFINE_UNQUOTED(DEFAULT_LIBEXEC, "$default_libexec", [script path])
+AC_DEFINE_UNQUOTED(DEFAULT_DATADIR, "$default_datadir", [data path])
 AC_DEFINE_UNQUOTED(DEFAULT_PAGING, $default_paging, [default page size])
 
 AC_CHECK_LIB(msvcrt, fopen, [
@@ -325,14 +279,9 @@
 AC_SUBST(BAYONNE_LIBS)
 AC_SUBST(EXOSIP2_LIBS)
 AC_SUBST(EXOSIP2_FLAGS)
-AC_SUBST(ORTP_LIBS)
-AC_SUBST(ORTP_FLAGS)
 AC_SUBST(LT_VERSION)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(MODFLAGS)
 AC_SUBST(DLOPEN)
-AC_OUTPUT(Makefile inc/Makefile runtime/Makefile test/Makefile utils/Makefile
-bayonne.pc bayonne-config
-server/Makefile sipwitch/Makefile
-)
-
+AC_OUTPUT(Makefile inc/Makefile engine/Makefile test/Makefile)
+