diff --git a/.gitignore b/.gitignore
index 52ccf6a029561acd65b551b9e61287b80358b857..6668eaa3a512bd33f0fe35cd4b2b1ae967acabd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,17 @@ Makefile
 *.raw
 *.pod
 
+autom4te.cache
+config.guess
+config.*
+configure
+depcomp
+install-sh
+INSTALL
+missing
+stamp-h1
+ltmain.sh
+
 # Binary translation files
 *.mo
 libtool
@@ -30,38 +41,9 @@ doc/doxygen/core-doc
 doc/doxygen/gtk-gui-doc
 doc/*.html
 
-# Ignore buildsys stuff
-/autom4te.cache
-/configure
-/depcomp
-/missing
-/ltmain.sh
-/libtool
-/install-sh
-/stamp-h1
-/Makefile
-gnome/stamp-h1
-*.omf
-
 # Ignore built stuff
-/src/sflphoned
-/src/sflphone
 /src/.libs
 
-# Ignore daemon stuff
-/daemon/autom4te.cache
-/daemon/config.guess
-/daemon/config.*
-/daemon/configure
-/daemon/depcomp
-/daemon/install-sh
-/daemon/INSTALL
-/daemon/missing
-/daemon/src/dbus/org.sflphone.SFLphone.service
-/daemon/src/sflphoned
-/daemon/stamp-h1
-/daemon/ltmain.sh
-
 # PJSIP files
 *.depend
 *i686-pc-linux-gnu
@@ -84,235 +66,8 @@ os_auto.h
 config_site.h
 config_auto.h
 
-/libs/pjproject-1.0.3/pjlib-util/build/os-auto.mak
-/libs/pjproject-1.0.3/pjlib/build/os-auto.mak
-/libs/pjproject-1.0.3/pjlib/include/pj/compat/m_auto.h
-/libs/pjproject-1.0.3/pjlib/include/pj/compat/os_auto.h
-/libs/pjproject-1.0.3/pjlib/include/pj/config_site.h
-/libs/pjproject-1.0.3/pjmedia/build/os-auto.mak
-/libs/pjproject-1.0.3/pjmedia/include/pjmedia-codec/config_auto.h
-/libs/pjproject-1.0.3/pjmedia/include/pjmedia/config_auto.h
-/libs/pjproject-1.0.3/pjsip/build/os-auto.mak
-/libs/pjproject-1.0.3/pjsip/include/pjsip/sip_autoconf.h
-/libs/pjproject-1.0.3/third_party/build/os-auto.mak
-/libs/pjproject-1.0.3/third_party/build/portaudio/os-auto.mak
-
-# Makefile
-/daemon/src/Makefile
-/daemon/src/dbus/Makefile
-/daemon/src/config/Makefile
-/daemon/src/plug-in/Makefile
-/daemon/src/plug-in/test/Makefile
-/daemon/src/plug-in/audiorecorder/Makefile
-/daemon/src/audio/Makefile
-/daemon/src/audio/codecs/Makefile
-/daemon/src/audio/codecs/ilbc/Makefile
-/daemon/src/hooks/Makefile
-/daemon/doc/Makefile
-/daemon/man/Makefile
-/daemon/po/Makefile
-/daemon/test/Makefile
-/daemon/ringtones/Makefile
-/daemon/doc/doxygen/Makefile
-/daemon/libs/Makefile
-/daemon/libs/utilspp/Makefile
-/daemon/libs/stund/Makefile
-/daemon/libs/iax2/Makefile
-/daemon/libs/utilspp/functor/Makefile
-/daemon/libs/utilspp/singleton/Makefile
-/gnome/Makefile
-/gnome/src/Makefile
-/gnome/src/config/Makefile
-/gnome/src/dbus/Makefile
-/gnome/src/contacts/Makefile
-/gnome/src/contacts/addressbook/Makefile
-/gnome/src/icons/Makefile
-/gnome/pixmaps/Makefile
-/gnome/tests/Makefile
-/gnome/man/Makefile
-/gnome/src/widget/Makefile
-/gnome/doc/Makefile
-/gnome/po/Makefile
-/gnome/webkit/Makefile
-
-
-# Ignore gnome stuff
-/gnome/config.*
-/gnome/configure
-/gnome/depcomp
-/gnome/install-sh
-/gnome/missing
-/gnome/mkinstalldirs
-/gnome/src/sflphone-client-gnome
-/gnome/autom4te*
-/gnome/sflphone.desktop
-/gnome/confdefs.h
-/gnome/conftest.dir
-/gnome/tests/check_config
-/gnome/tests/check_contacts
-/gnome/tests/check_dbus
-/gnome/tests/check_global
-/gnome/src/dbus/marshaller.c
-/gnome/src/dbus/marshaller.h
-/gnome/ltmain.sh
-/gnome/@GCONF_SCHEMA_FILE_DIR@/
-/gnome/active
-/gnome/man/sflphone.pod
-
-
-# Ignore sflphone_kde stuff
-/kde/build
-/kde/*.moc
-/kde/src/moc_*.cpp
-/kde/src/ui_*.h
-#/kde/po/
-#/kde/po/* 
-#/kde/doc/
-#/kde/man/
-#/kde/data/
-/kde/CMakeCache.txt
-/kde/CMakeLists.txt.user
-/kde/CTestTestfile.cmake
-/kde/*.cmake
-/kde/Makefile
-/kde/CMakeFiles/*
-/kde/CMakeTmp/
-/kde/qtcreator-build/
-/kde/src/.directory
-/kde/src/Makefile
-/kde/src/CTestTestfile.cmake
-/kde/src/CMakeFiles/
-/kde/src/*.moc
-/kde/src/callmanager_dbus_interface.*
-/kde/src/configurationmanager_dbus_interface.*
-/kde/src/instance_dbus_interface.*
-/kde/src/kde_automoc.cpp
-/kde/src/kde_automoc.cpp.files
-/kde/src/cmake_install.cmake
-/kde/src/kcfg_settings.cpp
-/kde/src/kcfg_settings.h
-/kde/src/qrc_resources.cxx
-/kde/src/kde
-/kde/src/kde.shell
-/kde/man/sflphone.pod
-
-# Ignore sflphone-plugins stuff
-
-/sflphone-plugins/.cproject
-/sflphone-plugins/.project
-/sflphone-plugins/.settings/*
-/sflphone-plugins/active
-/sflphone-plugins/autom4te.cache/*
-/sflphone-plugins/config.guess
-/sflphone-plugins/config.*
-/sflphone-plugins/configure
-/sflphone-plugins/depcomp
-/sflphone-plugins/gnome-doc-utils.make
-/sflphone-plugins/install-sh
-/sflphone-plugins/ltmain.sh
-/sflphone-plugins/missing
-/sflphone-plugins/gnome.schemas
-/sflphone-plugins/sflphone.desktop
-/sflphone-plugins/sflphone.desktop.*
-/sflphone-plugins/stamp-h.in
-/sflphone-plugins/stamp-h1
-
-# Ignore sub-modules stuff
-## libiax2
-/daemon/libs/libiax2/doc/html
-/daemon/libs/libiax2/config.*
-/daemon/libs/libiax2/autom4te.cache
-/daemon/libs/libiax2/src/.libs
-/daemon/libs/libiax2/libtool
-/daemon/libs/libiax2/ltmain.sh
-/daemon/libs/libiax2/iax-config
-/daemon/libs/libiax2/configure
-/daemon/libs/libiax2/Makefile
-/daemon/libs/libiax2/iax2-config
-/daemon/libs/libiax2/src/Makefile
-
-## dbus-c++
-/daemon/libs/dbus-c++/Makefile
-/daemon/libs/dbus-c++/autom4te.cache/requests
-/daemon/libs/dbus-c++/config.log
-/daemon/libs/dbus-c++/Makefile
-/daemon/libs/dbus-c++/autom4te.cache/requests
-/daemon/libs/dbus-c++/config.log
-/daemon/libs/dbus-c++/config.status
-/daemon/libs/dbus-c++/configure
-/daemon/libs/dbus-c++/data/Makefile
-/daemon/libs/dbus-c++/dbus-c++-1-uninstalled.pc
-/daemon/libs/dbus-c++/dbus-c++-1.pc
-/daemon/libs/dbus-c++/doc/Doxyfile
-/daemon/libs/dbus-c++/doc/Makefile
-/daemon/libs/dbus-c++/examples/Makefile
-/daemon/libs/dbus-c++/examples/echo/.libs/
-/daemon/libs/dbus-c++/examples/echo/Makefile
-/daemon/libs/dbus-c++/examples/echo/echo-client-glue.h
-/daemon/libs/dbus-c++/examples/echo/echo-client-mt
-/daemon/libs/dbus-c++/examples/echo/echo-server
-/daemon/libs/dbus-c++/examples/echo/echo-server-glue.h
-/daemon/libs/dbus-c++/examples/glib/Makefile
-/daemon/libs/dbus-c++/examples/glib/dbus-glue.h
-/daemon/libs/dbus-c++/examples/hal/.libs/
-/daemon/libs/dbus-c++/examples/hal/Makefile
-/daemon/libs/dbus-c++/examples/hal/hal-listen
-/daemon/libs/dbus-c++/examples/properties/.libs/
-/daemon/libs/dbus-c++/examples/properties/Makefile
-/daemon/libs/dbus-c++/examples/properties/propsgs-client
-/daemon/libs/dbus-c++/examples/properties/propsgs-glue-adaptor.h
-/daemon/libs/dbus-c++/examples/properties/propsgs-glue-proxy.h
-/daemon/libs/dbus-c++/examples/properties/propsgs-server
-/daemon/libs/dbus-c++/include/dbus-c++/config.h
-/daemon/libs/dbus-c++/include/dbus-c++/stamp-h1
-/daemon/libs/dbus-c++/src/.libs/
-/daemon/libs/dbus-c++/src/Makefile
-/daemon/libs/dbus-c++/tools/.libs/
-/daemon/libs/dbus-c++/tools/Makefile
-/daemon/libs/dbus-c++/tools/dbusxx-introspect
-/daemon/libs/dbus-c++/tools/dbusxx-xml2cpp
-
 # Ignore temp files
 *~
 
-# GNOME doc file
-/gnome/gnome-doc-utils.make
-/gnome/doc/de/
-/gnome/doc/fr/
-/gnome/doc/es/
-/gnome/doc/it/
-/gnome/doc/ko/
-/gnome/doc/pl/
-/gnome/doc/pt/
-/gnome/doc/pt_BR/
-/gnome/doc/ru/
-/gnome/doc/zh_CN/
-/gnome/doc/zh_TW/
-/gnome/doc/zh_HK/
-
-# build system
-/tools/build-system/launchpad/daemon
-!/tools/build-system/launchpad/daemon/debian
-/tools/build-system/launchpad/gnome
-!/tools/build-system/launchpad/gnome/debian
-/tools/build-system/launchpad/kde
-!/tools/build-system/launchpad/kde/debian
-/tools/build-system/launchpad/*.dsc
-/tools/build-system/launchpad/*.changes
-/tools/build-system/launchpad/*.tar.gz
-/tools/build-system/launchpad/*.build
-/tools/build-system/launchpad/*.upload
-
-# telify
-/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone
-/tools/mozilla-telify-sflphone/tmp/
-/tools/mozilla-telify-sflphone/*-stamp
-/tools/*.dsc
-/tools/*.tar.gz
-/tools/*.deb
-/tools/*.build
-/tools/*.changes
-/tools/mozilla-telify-sflphone/debian/control
-/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
-/tools/mozilla-telify-sflphone/debian*
-/tools/build-system/launchpad/mozilla-telify-sflphone/*
+# IDE stuffs
+nbproject
diff --git a/daemon/.gitignore b/daemon/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..01bcf84a048c656b051dc1a8621adf1c628b4b83
--- /dev/null
+++ b/daemon/.gitignore
@@ -0,0 +1,58 @@
+
+src/dbus/org.sflphone.SFLphone.service
+src/sflphoned
+
+# Ignore sub-modules stuff
+## libiax2
+libs/libiax2/doc/html
+libs/libiax2/config.*
+libs/libiax2/autom4te.cache
+libs/libiax2/src/.libs
+libs/libiax2/libtool
+libs/libiax2/ltmain.sh
+libs/libiax2/iax-config
+libs/libiax2/configure
+libs/libiax2/iax2-config
+
+## dbus-c++
+libs/dbus-c++/autom4te.cache/requests
+libs/dbus-c++/config.log
+libs/dbus-c++/autom4te.cache/requests
+libs/dbus-c++/config.log
+libs/dbus-c++/config.status
+libs/dbus-c++/configure
+libs/dbus-c++/dbus-c++-1-uninstalled.pc
+libs/dbus-c++/dbus-c++-1.pc
+libs/dbus-c++/doc/Doxyfile
+libs/dbus-c++/examples/echo/.libs/
+libs/dbus-c++/examples/echo/echo-client-glue.h
+libs/dbus-c++/examples/echo/echo-client-mt
+libs/dbus-c++/examples/echo/echo-server
+libs/dbus-c++/examples/echo/echo-server-glue.h
+libs/dbus-c++/examples/glib/dbus-glue.h
+libs/dbus-c++/examples/hal/.libs/
+libs/dbus-c++/examples/hal/hal-listen
+libs/dbus-c++/examples/properties/.libs/
+libs/dbus-c++/examples/properties/propsgs-client
+libs/dbus-c++/examples/properties/propsgs-glue-adaptor.h
+libs/dbus-c++/examples/properties/propsgs-glue-proxy.h
+libs/dbus-c++/examples/properties/propsgs-server
+libs/dbus-c++/include/dbus-c++/config.h
+libs/dbus-c++/include/dbus-c++/stamp-h1
+libs/dbus-c++/src/.libs/
+libs/dbus-c++/tools/.libs/
+libs/dbus-c++/tools/dbusxx-introspect
+libs/dbus-c++/tools/dbusxx-xml2cpp
+
+libs/pjproject/pjlib-util/build/os-auto.mak
+libs/pjproject/pjlib/build/os-auto.mak
+libs/pjproject/pjlib/include/pj/compat/m_auto.h
+libs/pjproject/pjlib/include/pj/compat/os_auto.h
+libs/pjproject/pjlib/include/pj/config_site.h
+libs/pjproject/pjmedia/build/os-auto.mak
+libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h
+libs/pjproject/pjmedia/include/pjmedia/config_auto.h
+libs/pjproject/pjsip/build/os-auto.mak
+libs/pjproject/pjsip/include/pjsip/sip_autoconf.h
+libs/pjproject/third_party/build/os-auto.mak
+libs/pjproject/third_party/build/portaudio/os-auto.mak
diff --git a/gnome/.gitignore b/gnome/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..062344668bf4748809802cfae31ff6e42fbc1fc3
--- /dev/null
+++ b/gnome/.gitignore
@@ -0,0 +1,38 @@
+config.*
+configure
+depcomp
+install-sh
+missing
+mkinstalldirs
+src/sflphone-client-gnome
+autom4te*
+sflphone.desktop
+confdefs.h
+conftest.dir
+tests/check_config
+tests/check_contacts
+tests/check_dbus
+tests/check_global
+src/dbus/marshaller.c
+src/dbus/marshaller.h
+ltmain.sh
+@GCONF_SCHEMA_FILE_DIR@/
+active
+man/sflphone.pod
+*.omf
+compile
+
+# GNOME doc file
+gnome-doc-utils.make
+doc/de/
+doc/fr/
+doc/es/
+doc/it/
+doc/ko/
+doc/pl/
+doc/pt/
+doc/pt_BR/
+doc/ru/
+doc/zh_CN/
+doc/zh_TW/
+doc/zh_HK/
diff --git a/kde/.gitignore b/kde/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..3ac1081dfa2a9986728e4a1ea30ad3225e70e019
--- /dev/null
+++ b/kde/.gitignore
@@ -0,0 +1,32 @@
+build
+*.moc
+src/moc_*.cpp
+src/ui_*.h
+#po/
+#po/* 
+#doc/
+#man/
+#data/
+CMakeCache.txt
+CMakeLists.txt.user
+CTestTestfile.cmake
+*.cmake
+CMakeFiles/*
+CMakeTmp/
+qtcreator-build/
+src/.directory
+src/CTestTestfile.cmake
+src/CMakeFiles/
+src/*.moc
+src/callmanager_dbus_interface.*
+src/configurationmanager_dbus_interface.*
+src/instance_dbus_interface.*
+src/kde_automoc.cpp
+src/kde_automoc.cpp.files
+src/cmake_install.cmake
+src/kcfg_settings.cpp
+src/kcfg_settings.h
+src/qrc_resources.cxx
+src/kde
+src/kde.shell
+man/sflphone.pod
diff --git a/plugins/.gitignore b/plugins/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..998031e94ace72b8c33d7b6121bc6ca0695f5568
--- /dev/null
+++ b/plugins/.gitignore
@@ -0,0 +1,19 @@
+.cproject
+.project
+.settings/*
+active
+autom4te.cache/*
+config.guess
+config.*
+configure
+depcomp
+gnome-doc-utils.make
+install-sh
+ltmain.sh
+missing
+gnome.schemas
+sflphone.desktop
+sflphone.desktop.*
+stamp-h.in
+stamp-h1
+
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..52d9ad73baeb0a9d00cc4ce9731c5c14f60a29e2
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,27 @@
+# build system
+build-system/launchpad/daemon
+!build-system/launchpad/daemon/debian
+build-system/launchpad/gnome
+!build-system/launchpad/gnome/debian
+build-system/launchpad/kde
+!build-system/launchpad/kde/debian
+build-system/launchpad/*.dsc
+build-system/launchpad/*.changes
+build-system/launchpad/*.tar.gz
+build-system/launchpad/*.build
+build-system/launchpad/*.upload
+
+# telify
+mozilla-telify-sflphone/debian/mozilla-telify-sflphone
+mozilla-telify-sflphone/tmp/
+mozilla-telify-sflphone/*-stamp
+*.dsc
+*.tar.gz
+*.deb
+*.build
+*.changes
+mozilla-telify-sflphone/debian/control
+mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
+mozilla-telify-sflphone/debian*
+build-system/launchpad/mozilla-telify-sflphone/*
+