diff --git a/.gitignore b/.gitignore
index da90572da..dfa4ac37c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,149 +26,12 @@ default.edj
 /config.status
 /config.sub
 /configure
-/data/etc/sysactions.conf
-/data/themes/default.edj
-/data/xsession/enlightenment.desktop
 /depcomp
-/doc/e.dox
 /enlightenment.pc
 /enlightenment.spec
 /install-sh
 /libtool
 /ltmain.sh
-/m4/codeset.m4
-/m4/gettext.m4
-/m4/glibc21.m4
-/m4/iconv.m4
-/m4/intdiv0.m4
-/m4/inttypes-pri.m4
-/m4/inttypes.m4
-/m4/inttypes_h.m4
-/m4/isc-posix.m4
-/m4/lcmessage.m4
-/m4/lib-ld.m4
-/m4/lib-link.m4
-/m4/lib-prefix.m4
-/m4/libtool.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
-/m4/nls.m4
-/m4/po.m4
-/m4/progtest.m4
-/m4/stdint_h.m4
-/m4/uintmax_t.m4
-/m4/ulonglong.m4
-/m4/glibc2.m4
-/m4/intl.m4
-/m4/intldir.m4
-/m4/intlmacosx.m4
-/m4/intmax.m4
-/m4/lock.m4
-/m4/longlong.m4
-/m4/printf-posix.m4
-/m4/size_max.m4
-/m4/visibility.m4
-/m4/wchar_t.m4
-/m4/wint_t.m4
-/m4/xsize.m4
 /missing
 /mkinstalldirs
-/po/Makefile.in.in
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/boldquot.sed
-/po/en@boldquot.header
-/po/en@quot.header
-/po/enlightenment.pot
-/po/insert-header.sin
-/po/quot.sed
-/po/remove-potcdate.sed
-/po/remove-potcdate.sin
-/po/stamp-po
-/src/bin/e_fm/enlightenment_fm
-/src/bin/e_fm_shared_types.h
-/src/bin/enlightenment
-/src/bin/enlightenment_alert
-/src/bin/enlightenment_backlight
-/src/bin/enlightenment_fm_op
-/src/bin/enlightenment_filemanager
-/src/bin/enlightenment_imc
-/src/bin/enlightenment_init
-/src/bin/enlightenment_open
-/src/bin/enlightenment_start
-/src/bin/enlightenment_static_grabber
-/src/bin/enlightenment_sys
-/src/bin/enlightenment_thumb
-/src/bin/enlightenment_open
-/src/modules/*/module.desktop
-/src/modules/battery/batget
-/src/modules/cpufreq/freqset
-/src/modules/everything/everything.pc
-/src/modules/illume2/doc/illume.dox
-/src/modules/temperature/tempget
 /stamp-h1
-/doc/Doxyfile
-src/bin/enlightenment_open
-src/modules/access/module.desktop
-src/modules/backlight/module.desktop
-src/modules/battery/module.desktop
-src/modules/clock/module.desktop
-src/modules/comp/module.desktop
-src/modules/conf/module.desktop
-src/modules/conf2/e-module-conf2.edj
-src/modules/conf_applications/module.desktop
-src/modules/conf_dialogs/module.desktop
-src/modules/conf_display/module.desktop
-src/modules/conf_edgebindings/module.desktop
-src/modules/conf_interaction/module.desktop
-src/modules/conf_intl/module.desktop
-src/modules/conf_keybindings/module.desktop
-src/modules/conf_menus/module.desktop
-src/modules/conf_paths/module.desktop
-src/modules/conf_performance/module.desktop
-src/modules/conf_randr/module.desktop
-src/modules/conf_shelves/module.desktop
-src/modules/conf_theme/module.desktop
-src/modules/conf_wallpaper2/module.desktop
-src/modules/conf_window_manipulation/module.desktop
-src/modules/conf_window_remembers/module.desktop
-src/modules/connman/module.desktop
-src/modules/cpufreq/module.desktop
-src/modules/everything/module.desktop
-src/modules/fileman/module.desktop
-src/modules/fileman_opinfo/module.desktop
-src/modules/gadman/module.desktop
-src/modules/ibar/module.desktop
-src/modules/ibox/module.desktop
-src/modules/illume-bluetooth/module.desktop
-src/modules/illume-home-toggle/module.desktop
-src/modules/illume-home/module.desktop
-src/modules/illume-indicator/e-module-illume-indicator.edj
-src/modules/illume-indicator/module.desktop
-src/modules/illume-kbd-toggle/module.desktop
-src/modules/illume-keyboard/e-module-illume-keyboard.edj
-src/modules/illume-keyboard/module.desktop
-src/modules/illume-mode-toggle/module.desktop
-src/modules/illume-softkey/e-module-illume-softkey.edj
-src/modules/illume-softkey/module.desktop
-src/modules/illume2/e-module-illume2.edj
-src/modules/illume2/module.desktop
-src/modules/mixer/module.desktop
-src/modules/msgbus/module.desktop
-src/modules/notification/module.desktop
-src/modules/ofono/module.desktop
-src/modules/pager/module.desktop
-src/modules/physics/module.desktop
-src/modules/shot/module.desktop
-src/modules/start/module.desktop
-src/modules/syscon/module.desktop
-src/modules/systray/module.desktop
-src/modules/tasks/module.desktop
-src/modules/temperature/module.desktop
-src/modules/tiling/e-module-tiling.edj
-src/modules/tiling/module.desktop
-src/modules/winlist/module.desktop
-src/modules/xkbswitch/module.desktop
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 000000000..db068695b
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1 @@
+/etc/sysactions.conf
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000000000..88aa8a178
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+/e.dox
+/Doxyfile
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 000000000..73b287f21
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,39 @@
+/codeset.m4
+/fcntl-o.m4
+/gettext.m4
+/glibc21.m4
+/iconv.m4
+/intdiv0.m4
+/inttypes-pri.m4
+/inttypes.m4
+/inttypes_h.m4
+/isc-posix.m4
+/lcmessage.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/libtool.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
+/lt~obsolete.m4
+/nls.m4
+/po.m4
+/progtest.m4
+/stdint_h.m4
+/uintmax_t.m4
+/ulonglong.m4
+/glibc2.m4
+/intl.m4
+/intldir.m4
+/intlmacosx.m4
+/intmax.m4
+/lock.m4
+/longlong.m4
+/printf-posix.m4
+/size_max.m4
+/threadlib.m4
+/visibility.m4
+/wchar_t.m4
+/wint_t.m4
+/xsize.m4
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 000000000..e244024ea
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,13 @@
+/Makefile.in.in
+/Makevars.template
+/POTFILES
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/enlightenment.pot
+/insert-header.sin
+/quot.sed
+/remove-potcdate.sed
+/remove-potcdate.sin
+/stamp-po
diff --git a/src/bin/.gitignore b/src/bin/.gitignore
new file mode 100644
index 000000000..df39011cd
--- /dev/null
+++ b/src/bin/.gitignore
@@ -0,0 +1,16 @@
+/e_fm_shared_types.h
+/enlightenment
+/enlightenment_alert
+/enlightenment_backlight
+/enlightenment_fm_op
+/enlightenment_filemanager
+/enlightenment_imc
+/enlightenment_init
+/enlightenment_open
+/enlightenment_start
+/enlightenment_static_grabber
+/enlightenment_sys
+/enlightenment_thumb
+/enlightenment_open
+
+/e_fm/enlightenment_fm
diff --git a/src/modules/.gitignore b/src/modules/.gitignore
new file mode 100644
index 000000000..592aee683
--- /dev/null
+++ b/src/modules/.gitignore
@@ -0,0 +1 @@
+module.desktop
diff --git a/src/modules/battery/.gitignore b/src/modules/battery/.gitignore
new file mode 100644
index 000000000..41679e367
--- /dev/null
+++ b/src/modules/battery/.gitignore
@@ -0,0 +1 @@
+batget
diff --git a/src/modules/conf2/.gitignore b/src/modules/conf2/.gitignore
new file mode 100644
index 000000000..bda70fc9d
--- /dev/null
+++ b/src/modules/conf2/.gitignore
@@ -0,0 +1 @@
+e-module-conf2.edj
diff --git a/src/modules/cpufreq/.gitignore b/src/modules/cpufreq/.gitignore
new file mode 100644
index 000000000..3e47b6b81
--- /dev/null
+++ b/src/modules/cpufreq/.gitignore
@@ -0,0 +1 @@
+freqset
diff --git a/src/modules/everything/.gitignore b/src/modules/everything/.gitignore
new file mode 100644
index 000000000..35077e6ea
--- /dev/null
+++ b/src/modules/everything/.gitignore
@@ -0,0 +1 @@
+everything.pc
diff --git a/src/modules/illume-indicator/.gitignore b/src/modules/illume-indicator/.gitignore
new file mode 100644
index 000000000..e11184d66
--- /dev/null
+++ b/src/modules/illume-indicator/.gitignore
@@ -0,0 +1 @@
+e-module-illume-indicator.edj
diff --git a/src/modules/illume-keyboard/.gitignore b/src/modules/illume-keyboard/.gitignore
new file mode 100644
index 000000000..fba055aa0
--- /dev/null
+++ b/src/modules/illume-keyboard/.gitignore
@@ -0,0 +1 @@
+e-module-illume-keyboard.edj
diff --git a/src/modules/illume-softkey/.gitignore b/src/modules/illume-softkey/.gitignore
new file mode 100644
index 000000000..c904640e6
--- /dev/null
+++ b/src/modules/illume-softkey/.gitignore
@@ -0,0 +1 @@
+e-module-illume-softkey.edj
diff --git a/src/modules/illume2/.gitignore b/src/modules/illume2/.gitignore
new file mode 100644
index 000000000..3aef3d730
--- /dev/null
+++ b/src/modules/illume2/.gitignore
@@ -0,0 +1,3 @@
+/e-module-illume2.edj
+
+/doc/illume.dox
diff --git a/src/modules/temperature/.gitignore b/src/modules/temperature/.gitignore
new file mode 100644
index 000000000..4d652f4c2
--- /dev/null
+++ b/src/modules/temperature/.gitignore
@@ -0,0 +1 @@
+tempget
diff --git a/src/modules/tiling/.gitignore b/src/modules/tiling/.gitignore
new file mode 100644
index 000000000..d6ceca657
--- /dev/null
+++ b/src/modules/tiling/.gitignore
@@ -0,0 +1 @@
+e-module-tiling.edj