diff --git a/.gitignore b/.gitignore
index 31421b8d33..1fc3016d3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,6 @@
 .deps
 .\#*
 \#*
-/Debug/
-/Release/
-/All/
-/bin/
 *.user
 *.suo
 *.ncb
@@ -39,26 +35,46 @@
 *.xz
 *.bz2
 *.tbz2
+aclocal.m4
+autom4te.cache
+config.cache
+configure.lineno
+config.log
+config.status
 core.*
-/Path
+
 /w32/Library/lastversion
 /w32/Library/tmpVersion.Bat
 !/w32/Console/FreeSwitchConsole.vcproj.user
 !/w32/Setup/inno_setup/vcredist_x64.exe
 !/w32/Setup/inno_setup/vcredist_x86.exe
+
 /.version
+/a.out.dSYM
 /AUTHORS
-/COPYING
 /ChangeLog
+/configure
+/COPYING
+/freeswitch
+/fs_cli
+/fs_encode
+/fs_ivrd
+/libtool
 /Makefile
 /Makefile.in
+/modules.conf
 /NEWS
+/Path
+/quiet_libtool
 /README
 /TAGS
-aclocal.m4
-autom4te.cache
-/build/Makefile
-/build/Makefile.in
+/tone2wav
+
+/All/
+/Debug/
+/bin/
+/Release/
+
 /build/config/compile
 /build/config/config.guess
 /build/config/depcomp
@@ -68,74 +84,66 @@ autom4te.cache
 /build/freeswitch.pc
 /build/getlib.sh
 /build/getsounds.sh
+/build/Makefile
+/build/Makefile.in
 /build/modmake.rules
-config.cache
-config.log
-config.status
-/configure
-configure.lineno
-/freeswitch
-/fs_cli
-/fs_encode
-/fs_ivrd
-/libtool
-/modules.conf
-/quiet_libtool
-/tone2wav
+
+/libs/curl/lib/ca-bundle.h
+/libs/esl/fs_cli
+/libs/esl/ivrd
+/libs/esl/testclient
+/libs/esl/testserver
+/libs/freetdm/detect_dtmf
+/libs/freetdm/detect_tones
+/libs/freetdm/testanalog
+/libs/freetdm/testapp
+/libs/freetdm/testcid
+/libs/freetdm/testpri
+/libs/freetdm/testr2
+/libs/freetdm/testsangomaboost
+/libs/freetdm/testtones
+/libs/fsg729-*-installer
+/libs/g729/
+/libs/libcodec2/config.guess
+/libs/libcodec2/config.sub
+/libs/libcodec2/configure
+/libs/libcodec2/depcomp
+/libs/libcodec2/install-sh
+/libs/libcodec2/libtool
+/libs/libcodec2/ltmain.sh
+/libs/libcodec2/Makefile
+/libs/libcodec2/Makefile.in
+/libs/libcodec2/missing
+/libs/libcodec2/src/Makefile
+/libs/libcodec2/src/Makefile.in
+/libs/libcodec2/unittest/Makefile
+/libs/libcodec2/unittest/Makefile.in
+
 /scripts/fsxs
 /scripts/gentls_cert
-/a.out.dSYM
-src/mod/applications/mod_easyroute/Makefile
-src/mod/applications/mod_lcr/Makefile
-src/mod/applications/mod_nibblebill/Makefile
-src/mod/applications/mod_rss/Makefile
-src/mod/applications/mod_snipe_hunt/Makefile
-src/mod/codecs/mod_dahdi_codec/Makefile
-src/mod/dialplans/mod_dialplan_directory/Makefile
-src/mod/formats/mod_shell_stream/Makefile
-src/mod/say/mod_say_de/Makefile
-src/mod/say/mod_say_es/Makefile
-src/mod/say/mod_say_fr/Makefile
-src/mod/say/mod_say_it/Makefile
-src/mod/say/mod_say_nl/Makefile
-src/mod/say/mod_say_th/Makefile
-src/mod/say/mod_say_zh/Makefile
-libs/curl/lib/ca-bundle.h
-libs/g729/
-libs/fsg729-*-installer
-src/mod/codecs/mod_com_g729/
-src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
-src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
-src/mod/languages/mod_python/mod_python_wrap.cpp.orig
-libs/freetdm/detect_dtmf
-libs/freetdm/detect_tones
-libs/freetdm/testanalog
-libs/freetdm/testapp
-libs/freetdm/testcid
-libs/freetdm/testpri
-libs/freetdm/testr2
-libs/freetdm/testsangomaboost
-libs/freetdm/testtones
-libs/esl/fs_cli
-libs/esl/ivrd
-libs/esl/testserver
-libs/esl/testclient
-libs/libcodec2/Makefile
-libs/libcodec2/Makefile.in
-libs/libcodec2/config.guess
-libs/libcodec2/config.sub
-libs/libcodec2/configure
-libs/libcodec2/depcomp
-libs/libcodec2/install-sh
-libs/libcodec2/libtool
-libs/libcodec2/ltmain.sh
-libs/libcodec2/missing
-libs/libcodec2/src/Makefile
-libs/libcodec2/src/Makefile.in
-libs/libcodec2/unittest/Makefile
-libs/libcodec2/unittest/Makefile.in
-src/mod/applications/mod_osp/Makefile
-src/mod/applications/mod_osp/Makefile.in
-src/mod/applications/mod_hash/Makefile
-src/mod/applications/mod_hash/Makefile.in
-src/mod/applications/mod_hash/mod_hash.log
+
+/src/mod/applications/mod_easyroute/Makefile
+/src/mod/applications/mod_hash/Makefile
+/src/mod/applications/mod_hash/Makefile.in
+/src/mod/applications/mod_hash/mod_hash.log
+/src/mod/applications/mod_lcr/Makefile
+/src/mod/applications/mod_nibblebill/Makefile
+/src/mod/applications/mod_osp/Makefile
+/src/mod/applications/mod_osp/Makefile.in
+/src/mod/applications/mod_rss/Makefile
+/src/mod/applications/mod_snipe_hunt/Makefile
+/src/mod/codecs/mod_com_g729/
+/src/mod/codecs/mod_dahdi_codec/Makefile
+/src/mod/dialplans/mod_dialplan_directory/Makefile
+/src/mod/formats/mod_shell_stream/Makefile
+/src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
+/src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
+/src/mod/languages/mod_python/mod_python_wrap.cpp.orig
+/src/mod/say/mod_say_de/Makefile
+/src/mod/say/mod_say_es/Makefile
+/src/mod/say/mod_say_fr/Makefile
+/src/mod/say/mod_say_it/Makefile
+/src/mod/say/mod_say_nl/Makefile
+/src/mod/say/mod_say_th/Makefile
+/src/mod/say/mod_say_zh/Makefile
+