diff --git a/net/freeswitch-stable/Config.in b/net/freeswitch/Config.in
similarity index 100%
rename from net/freeswitch-stable/Config.in
rename to net/freeswitch/Config.in
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch/Makefile
similarity index 100%
rename from net/freeswitch-stable/Makefile
rename to net/freeswitch/Makefile
diff --git a/net/freeswitch-stable/files/freeswitch.conf b/net/freeswitch/files/freeswitch.conf
similarity index 100%
rename from net/freeswitch-stable/files/freeswitch.conf
rename to net/freeswitch/files/freeswitch.conf
diff --git a/net/freeswitch-stable/files/freeswitch.hotplug b/net/freeswitch/files/freeswitch.hotplug
similarity index 100%
rename from net/freeswitch-stable/files/freeswitch.hotplug
rename to net/freeswitch/files/freeswitch.hotplug
diff --git a/net/freeswitch-stable/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
similarity index 100%
rename from net/freeswitch-stable/files/freeswitch.init
rename to net/freeswitch/files/freeswitch.init
diff --git a/net/freeswitch-stable/patches/003-modmake-fix.patch b/net/freeswitch/patches/003-modmake-fix.patch
similarity index 100%
rename from net/freeswitch-stable/patches/003-modmake-fix.patch
rename to net/freeswitch/patches/003-modmake-fix.patch
diff --git a/net/freeswitch-stable/patches/010-fix-zrtp-cflags.patch b/net/freeswitch/patches/010-fix-zrtp-cflags.patch
similarity index 100%
rename from net/freeswitch-stable/patches/010-fix-zrtp-cflags.patch
rename to net/freeswitch/patches/010-fix-zrtp-cflags.patch
diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch/patches/030-fix-configure-ac.patch
similarity index 100%
rename from net/freeswitch-stable/patches/030-fix-configure-ac.patch
rename to net/freeswitch/patches/030-fix-configure-ac.patch
diff --git a/net/freeswitch-stable/patches/040-gentls_cert_update_message_digest.patch b/net/freeswitch/patches/040-gentls_cert_update_message_digest.patch
similarity index 100%
rename from net/freeswitch-stable/patches/040-gentls_cert_update_message_digest.patch
rename to net/freeswitch/patches/040-gentls_cert_update_message_digest.patch
diff --git a/net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch b/net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch
similarity index 100%
rename from net/freeswitch-stable/patches/110-apr-add-cache-for-strerror_r.patch
rename to net/freeswitch/patches/110-apr-add-cache-for-strerror_r.patch
diff --git a/net/freeswitch-stable/patches/120-fix-copts.patch b/net/freeswitch/patches/120-fix-copts.patch
similarity index 100%
rename from net/freeswitch-stable/patches/120-fix-copts.patch
rename to net/freeswitch/patches/120-fix-copts.patch
diff --git a/net/freeswitch-stable/patches/130-fix-iksemel-copts.patch b/net/freeswitch/patches/130-fix-iksemel-copts.patch
similarity index 100%
rename from net/freeswitch-stable/patches/130-fix-iksemel-copts.patch
rename to net/freeswitch/patches/130-fix-iksemel-copts.patch
diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch/patches/140-libvpx-cross.patch
similarity index 100%
rename from net/freeswitch-stable/patches/140-libvpx-cross.patch
rename to net/freeswitch/patches/140-libvpx-cross.patch
diff --git a/net/freeswitch-stable/patches/150-erlang-m4.patch b/net/freeswitch/patches/150-erlang-m4.patch
similarity index 100%
rename from net/freeswitch-stable/patches/150-erlang-m4.patch
rename to net/freeswitch/patches/150-erlang-m4.patch
diff --git a/net/freeswitch-stable/patches/170-mod_random.patch b/net/freeswitch/patches/170-mod_random.patch
similarity index 100%
rename from net/freeswitch-stable/patches/170-mod_random.patch
rename to net/freeswitch/patches/170-mod_random.patch
diff --git a/net/freeswitch-stable/patches/180-mod_perl.patch b/net/freeswitch/patches/180-mod_perl.patch
similarity index 100%
rename from net/freeswitch-stable/patches/180-mod_perl.patch
rename to net/freeswitch/patches/180-mod_perl.patch
diff --git a/net/freeswitch-stable/patches/190-mod_pocketsphinx.patch b/net/freeswitch/patches/190-mod_pocketsphinx.patch
similarity index 100%
rename from net/freeswitch-stable/patches/190-mod_pocketsphinx.patch
rename to net/freeswitch/patches/190-mod_pocketsphinx.patch
diff --git a/net/freeswitch-stable/patches/200-mod_verto-fix-copts.patch b/net/freeswitch/patches/200-mod_verto-fix-copts.patch
similarity index 100%
rename from net/freeswitch-stable/patches/200-mod_verto-fix-copts.patch
rename to net/freeswitch/patches/200-mod_verto-fix-copts.patch
diff --git a/net/freeswitch-stable/patches/210-esl-perl-fix-copts.patch b/net/freeswitch/patches/210-esl-perl-fix-copts.patch
similarity index 100%
rename from net/freeswitch-stable/patches/210-esl-perl-fix-copts.patch
rename to net/freeswitch/patches/210-esl-perl-fix-copts.patch
diff --git a/net/freeswitch-stable/patches/230-mod_radius_cdr.patch b/net/freeswitch/patches/230-mod_radius_cdr.patch
similarity index 100%
rename from net/freeswitch-stable/patches/230-mod_radius_cdr.patch
rename to net/freeswitch/patches/230-mod_radius_cdr.patch
diff --git a/net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch b/net/freeswitch/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch
similarity index 100%
rename from net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch
rename to net/freeswitch/patches/260-mod_event_zmq-fix-build-with-fortify-headers.patch
diff --git a/net/freeswitch-stable/patches/270-fix-uclibc-iconv-in-gsmopen.patch b/net/freeswitch/patches/270-fix-uclibc-iconv-in-gsmopen.patch
similarity index 100%
rename from net/freeswitch-stable/patches/270-fix-uclibc-iconv-in-gsmopen.patch
rename to net/freeswitch/patches/270-fix-uclibc-iconv-in-gsmopen.patch
diff --git a/net/freeswitch-stable/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch b/net/freeswitch/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch
similarity index 100%
rename from net/freeswitch-stable/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch
rename to net/freeswitch/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch
diff --git a/net/freeswitch-stable/patches/290-fix-mod_freetdm-copts.patch b/net/freeswitch/patches/290-fix-mod_freetdm-copts.patch
similarity index 100%
rename from net/freeswitch-stable/patches/290-fix-mod_freetdm-copts.patch
rename to net/freeswitch/patches/290-fix-mod_freetdm-copts.patch
diff --git a/net/freeswitch-stable/patches/320-workaround-format-truncation-error-in-mod_cdr_mongodb.patch b/net/freeswitch/patches/320-workaround-format-truncation-error-in-mod_cdr_mongodb.patch
similarity index 100%
rename from net/freeswitch-stable/patches/320-workaround-format-truncation-error-in-mod_cdr_mongodb.patch
rename to net/freeswitch/patches/320-workaround-format-truncation-error-in-mod_cdr_mongodb.patch
diff --git a/net/freeswitch-stable/patches/330-do-not-install-freetdm-twice.patch b/net/freeswitch/patches/330-do-not-install-freetdm-twice.patch
similarity index 100%
rename from net/freeswitch-stable/patches/330-do-not-install-freetdm-twice.patch
rename to net/freeswitch/patches/330-do-not-install-freetdm-twice.patch
diff --git a/net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch b/net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
similarity index 100%
rename from net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
rename to net/freeswitch/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch
diff --git a/net/freeswitch-stable/patches/370-procd-compat.patch b/net/freeswitch/patches/370-procd-compat.patch
similarity index 100%
rename from net/freeswitch-stable/patches/370-procd-compat.patch
rename to net/freeswitch/patches/370-procd-compat.patch
diff --git a/net/freeswitch-stable/patches/380-disable-luajit.patch b/net/freeswitch/patches/380-disable-luajit.patch
similarity index 100%
rename from net/freeswitch-stable/patches/380-disable-luajit.patch
rename to net/freeswitch/patches/380-disable-luajit.patch
diff --git a/net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch b/net/freeswitch/patches/390-t38-reinvite-488-fix.patch
similarity index 100%
rename from net/freeswitch-stable/patches/390-t38-reinvite-488-fix.patch
rename to net/freeswitch/patches/390-t38-reinvite-488-fix.patch
diff --git a/net/freeswitch-stable/patches/400-disable-sofia-sip-tests.patch b/net/freeswitch/patches/400-disable-sofia-sip-tests.patch
similarity index 100%
rename from net/freeswitch-stable/patches/400-disable-sofia-sip-tests.patch
rename to net/freeswitch/patches/400-disable-sofia-sip-tests.patch