diff --git a/config/default/e.src b/data/config/default/e.src
similarity index 100%
rename from config/default/e.src
rename to data/config/default/e.src
diff --git a/config/default/e_bindings.src b/data/config/default/e_bindings.src
similarity index 100%
rename from config/default/e_bindings.src
rename to data/config/default/e_bindings.src
diff --git a/config/default/enlightenment-default.png b/data/config/default/enlightenment-default.png
similarity index 100%
rename from config/default/enlightenment-default.png
rename to data/config/default/enlightenment-default.png
diff --git a/config/default/meson.build b/data/config/default/meson.build
similarity index 100%
rename from config/default/meson.build
rename to data/config/default/meson.build
diff --git a/config/default/profile.desktop b/data/config/default/profile.desktop
similarity index 100%
rename from config/default/profile.desktop
rename to data/config/default/profile.desktop
diff --git a/config/meson.build b/data/config/meson.build
similarity index 100%
rename from config/meson.build
rename to data/config/meson.build
diff --git a/config/mobile/e.src b/data/config/mobile/e.src
similarity index 100%
rename from config/mobile/e.src
rename to data/config/mobile/e.src
diff --git a/config/mobile/e_bindings.src b/data/config/mobile/e_bindings.src
similarity index 100%
rename from config/mobile/e_bindings.src
rename to data/config/mobile/e_bindings.src
diff --git a/config/mobile/enlightenment-mobile.png b/data/config/mobile/enlightenment-mobile.png
similarity index 100%
rename from config/mobile/enlightenment-mobile.png
rename to data/config/mobile/enlightenment-mobile.png
diff --git a/config/mobile/meson.build b/data/config/mobile/meson.build
similarity index 100%
rename from config/mobile/meson.build
rename to data/config/mobile/meson.build
diff --git a/config/mobile/module.battery.src b/data/config/mobile/module.battery.src
similarity index 100%
rename from config/mobile/module.battery.src
rename to data/config/mobile/module.battery.src
diff --git a/config/mobile/module.conf.src b/data/config/mobile/module.conf.src
similarity index 100%
rename from config/mobile/module.conf.src
rename to data/config/mobile/module.conf.src
diff --git a/config/mobile/profile.desktop b/data/config/mobile/profile.desktop
similarity index 100%
rename from config/mobile/profile.desktop
rename to data/config/mobile/profile.desktop
diff --git a/config/profile.src b/data/config/profile.src
similarity index 100%
rename from config/profile.src
rename to data/config/profile.src
diff --git a/config/standard/e.src b/data/config/standard/e.src
similarity index 100%
rename from config/standard/e.src
rename to data/config/standard/e.src
diff --git a/config/standard/e_bindings.src b/data/config/standard/e_bindings.src
similarity index 100%
rename from config/standard/e_bindings.src
rename to data/config/standard/e_bindings.src
diff --git a/config/standard/enlightenment-standard.png b/data/config/standard/enlightenment-standard.png
similarity index 100%
rename from config/standard/enlightenment-standard.png
rename to data/config/standard/enlightenment-standard.png
diff --git a/config/standard/meson.build b/data/config/standard/meson.build
similarity index 100%
rename from config/standard/meson.build
rename to data/config/standard/meson.build
diff --git a/config/standard/module.battery.src b/data/config/standard/module.battery.src
similarity index 100%
rename from config/standard/module.battery.src
rename to data/config/standard/module.battery.src
diff --git a/config/standard/module.conf.src b/data/config/standard/module.conf.src
similarity index 100%
rename from config/standard/module.conf.src
rename to data/config/standard/module.conf.src
diff --git a/config/standard/module.cpufreq.src b/data/config/standard/module.cpufreq.src
similarity index 100%
rename from config/standard/module.cpufreq.src
rename to data/config/standard/module.cpufreq.src
diff --git a/config/standard/module.fileman.src b/data/config/standard/module.fileman.src
similarity index 100%
rename from config/standard/module.fileman.src
rename to data/config/standard/module.fileman.src
diff --git a/config/standard/module.ibar.src b/data/config/standard/module.ibar.src
similarity index 100%
rename from config/standard/module.ibar.src
rename to data/config/standard/module.ibar.src
diff --git a/config/standard/module.ibox.src b/data/config/standard/module.ibox.src
similarity index 100%
rename from config/standard/module.ibox.src
rename to data/config/standard/module.ibox.src
diff --git a/config/standard/module.pager.src b/data/config/standard/module.pager.src
similarity index 100%
rename from config/standard/module.pager.src
rename to data/config/standard/module.pager.src
diff --git a/config/standard/module.temperature.src b/data/config/standard/module.temperature.src
similarity index 100%
rename from config/standard/module.temperature.src
rename to data/config/standard/module.temperature.src
diff --git a/config/standard/profile.desktop b/data/config/standard/profile.desktop
similarity index 100%
rename from config/standard/profile.desktop
rename to data/config/standard/profile.desktop
diff --git a/config/tiling/e.src b/data/config/tiling/e.src
similarity index 100%
rename from config/tiling/e.src
rename to data/config/tiling/e.src
diff --git a/config/tiling/e_bindings.src b/data/config/tiling/e_bindings.src
similarity index 100%
rename from config/tiling/e_bindings.src
rename to data/config/tiling/e_bindings.src
diff --git a/config/tiling/enlightenment-tiling.png b/data/config/tiling/enlightenment-tiling.png
similarity index 100%
rename from config/tiling/enlightenment-tiling.png
rename to data/config/tiling/enlightenment-tiling.png
diff --git a/config/tiling/meson.build b/data/config/tiling/meson.build
similarity index 100%
rename from config/tiling/meson.build
rename to data/config/tiling/meson.build
diff --git a/config/tiling/module.battery.src b/data/config/tiling/module.battery.src
similarity index 100%
rename from config/tiling/module.battery.src
rename to data/config/tiling/module.battery.src
diff --git a/config/tiling/module.conf.src b/data/config/tiling/module.conf.src
similarity index 100%
rename from config/tiling/module.conf.src
rename to data/config/tiling/module.conf.src
diff --git a/config/tiling/module.cpufreq.src b/data/config/tiling/module.cpufreq.src
similarity index 100%
rename from config/tiling/module.cpufreq.src
rename to data/config/tiling/module.cpufreq.src
diff --git a/config/tiling/module.fileman.src b/data/config/tiling/module.fileman.src
similarity index 100%
rename from config/tiling/module.fileman.src
rename to data/config/tiling/module.fileman.src
diff --git a/config/tiling/module.ibar.src b/data/config/tiling/module.ibar.src
similarity index 100%
rename from config/tiling/module.ibar.src
rename to data/config/tiling/module.ibar.src
diff --git a/config/tiling/module.ibox.src b/data/config/tiling/module.ibox.src
similarity index 100%
rename from config/tiling/module.ibox.src
rename to data/config/tiling/module.ibox.src
diff --git a/config/tiling/module.pager.src b/data/config/tiling/module.pager.src
similarity index 100%
rename from config/tiling/module.pager.src
rename to data/config/tiling/module.pager.src
diff --git a/config/tiling/module.temperature.src b/data/config/tiling/module.temperature.src
similarity index 100%
rename from config/tiling/module.temperature.src
rename to data/config/tiling/module.temperature.src
diff --git a/config/tiling/module.tiling.src b/data/config/tiling/module.tiling.src
similarity index 100%
rename from config/tiling/module.tiling.src
rename to data/config/tiling/module.tiling.src
diff --git a/config/tiling/profile.desktop b/data/config/tiling/profile.desktop
similarity index 100%
rename from config/tiling/profile.desktop
rename to data/config/tiling/profile.desktop
diff --git a/meson.build b/meson.build
index f947e9fde..62714857c 100644
--- a/meson.build
+++ b/meson.build
@@ -346,9 +346,9 @@ subdir('src/bin')
 
 subdir('src/modules')
 
-subdir('config')
 
 subdir('data/backgrounds')
+subdir('data/config')
 subdir('data/desktop')
 subdir('data/etc')
 subdir('data/favorites')