diff --git a/Makefile.am b/Makefile.am
index e8624efc28..a753de855d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
 --with-systemdunitdir=. \
 --enable-always-build-examples
 
-SUBDIRS = src data config doc
+SUBDIRS = src data doc
 
 if HAVE_PO
 
diff --git a/configure.ac b/configure.ac
index 84ea995299..f2cb49fce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5698,13 +5698,13 @@ esac
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-config/Makefile
-config/default/Makefile
-config/default/base.src
-config/mobile/Makefile
-config/mobile/base.src
-config/standard/Makefile
-config/standard/base.src
+data/elementary/config/Makefile
+data/elementary/config/default/Makefile
+data/elementary/config/default/base.src
+data/elementary/config/mobile/Makefile
+data/elementary/config/mobile/base.src
+data/elementary/config/standard/Makefile
+data/elementary/config/standard/base.src
 doc/Makefile
 doc/Doxyfile
 doc/previews/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 74a025ef8f..6f409a3afe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST =
 CLEANFILES =
+SUBDIRS =
 
 ########################################################################
 # Embryo
@@ -119,6 +120,8 @@ EXTRA_DIST += $(eluafiles_DATA)
 
 # themes
 
+SUBDIRS += elementary/config
+
 elementaryfilesdir = $(datadir)/elementary/themes
 elementaryfiles_DATA = elementary/themes/default.edj
 CLEANFILES += elementary/themes/default.edj
diff --git a/config/.gitignore b/data/elementary/config/.gitignore
similarity index 100%
rename from config/.gitignore
rename to data/elementary/config/.gitignore
diff --git a/config/Makefile.am b/data/elementary/config/Makefile.am
similarity index 57%
rename from config/Makefile.am
rename to data/elementary/config/Makefile.am
index 690067909d..692651353e 100644
--- a/config/Makefile.am
+++ b/data/elementary/config/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = default standard mobile
 
-include ../src/Makefile_Eet_Helper.am
+include ../../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = profile.src
 
@@ -11,8 +11,8 @@ files_DATA = profile.cfg
 
 %.cfg: %.src
 	$(AM_V_EET) \
-	$(MKDIR_P) $(top_builddir)/config/; \
-	$(EET) -i $(top_builddir)/config/$@ config $< 0
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
+	$(EET) -i $(top_builddir)/data/elementary/config/$@ config $< 0
 
 clean-local:
 	rm -rf *.cfg *~
diff --git a/config/default/Makefile.am b/data/elementary/config/default/Makefile.am
similarity index 62%
rename from config/default/Makefile.am
rename to data/elementary/config/default/Makefile.am
index 6211ff7e1f..3986ae6b20 100644
--- a/config/default/Makefile.am
+++ b/data/elementary/config/default/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-include ../../src/Makefile_Eet_Helper.am
+include ../../../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
 
 %.cfg: %.src
 	$(AM_V_EET) \
-	$(MKDIR_P) $(top_builddir)/config/default/; \
-	$(EET) -e $(top_builddir)/config/default/$@ config $< 1
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/default/; \
+	$(EET) -e $(top_builddir)/data/elementary/config/default/$@ config $< 1
 
 clean-local:
 	rm -rf *.cfg *~
diff --git a/config/default/base.src.in b/data/elementary/config/default/base.src.in
similarity index 100%
rename from config/default/base.src.in
rename to data/elementary/config/default/base.src.in
diff --git a/config/default/icon.png b/data/elementary/config/default/icon.png
similarity index 100%
rename from config/default/icon.png
rename to data/elementary/config/default/icon.png
diff --git a/config/default/profile.desktop b/data/elementary/config/default/profile.desktop
similarity index 100%
rename from config/default/profile.desktop
rename to data/elementary/config/default/profile.desktop
diff --git a/config/mobile/Makefile.am b/data/elementary/config/mobile/Makefile.am
similarity index 63%
rename from config/mobile/Makefile.am
rename to data/elementary/config/mobile/Makefile.am
index 7cdfbd5881..2c6c9e2ef7 100644
--- a/config/mobile/Makefile.am
+++ b/data/elementary/config/mobile/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-include ../../src/Makefile_Eet_Helper.am
+include ../../../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
 
 %.cfg: %.src
 	$(AM_V_EET) \
-	$(MKDIR_P) $(top_builddir)/config/; \
-	$(EET) -e $(top_builddir)/config/mobile/$@ config $< 1
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/; \
+	$(EET) -e $(top_builddir)/data/elementary/config/mobile/$@ config $< 1
 
 clean-local:
 	rm -rf *.cfg *~
diff --git a/config/mobile/base.src.in b/data/elementary/config/mobile/base.src.in
similarity index 100%
rename from config/mobile/base.src.in
rename to data/elementary/config/mobile/base.src.in
diff --git a/config/mobile/icon.png b/data/elementary/config/mobile/icon.png
similarity index 100%
rename from config/mobile/icon.png
rename to data/elementary/config/mobile/icon.png
diff --git a/config/mobile/profile.desktop b/data/elementary/config/mobile/profile.desktop
similarity index 100%
rename from config/mobile/profile.desktop
rename to data/elementary/config/mobile/profile.desktop
diff --git a/config/profile.src b/data/elementary/config/profile.src
similarity index 100%
rename from config/profile.src
rename to data/elementary/config/profile.src
diff --git a/config/standard/Makefile.am b/data/elementary/config/standard/Makefile.am
similarity index 62%
rename from config/standard/Makefile.am
rename to data/elementary/config/standard/Makefile.am
index 3dd3c88c68..7ab55d0f80 100644
--- a/config/standard/Makefile.am
+++ b/data/elementary/config/standard/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-include ../../src/Makefile_Eet_Helper.am
+include ../../../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
 
 %.cfg: %.src
 	$(AM_V_EET) \
-	$(MKDIR_P) $(top_builddir)/config/standard/; \
-	$(EET) -e $(top_builddir)/config/standard/$@ config $< 1
+	$(MKDIR_P) $(top_builddir)/data/elementary/config/standard/; \
+	$(EET) -e $(top_builddir)/data/elementary/config/standard/$@ config $< 1
 
 clean-local:
 	rm -rf *.cfg *~
diff --git a/config/standard/base.src.in b/data/elementary/config/standard/base.src.in
similarity index 100%
rename from config/standard/base.src.in
rename to data/elementary/config/standard/base.src.in
diff --git a/config/standard/icon.png b/data/elementary/config/standard/icon.png
similarity index 100%
rename from config/standard/icon.png
rename to data/elementary/config/standard/icon.png
diff --git a/config/standard/profile.desktop b/data/elementary/config/standard/profile.desktop
similarity index 100%
rename from config/standard/profile.desktop
rename to data/elementary/config/standard/profile.desktop