diff --git a/configure.ac b/configure.ac
index db2c531..d401516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ AC_DEFINE_UNQUOTED(EINA_LOG_LEVEL_MAXIMUM, ${with_max_log_level}, [if set, loggi
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/bin/Makefile
 data/Makefile
 data/images/Makefile
 data/themes/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d99ee6..83643ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = bin
 
-bin_PROGRAMS = elm_theme_viewer
-
-elm_theme_viewer_CPPFLAGS = -I. \
--DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @ELM_THEME_VIEWER_CFLAGS@
-
-elm_theme_viewer_LDADD = @ELM_THEME_VIEWER_LIBS@
-
-elm_theme_viewer_SOURCES = \
-gui.c gui.h \
-log.c log.h \
-theme.c theme.h \
-widget.c widget.h \
-main.c common.h \
-gui_mobile.c gui_mobile.h \
-util.c util.h
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
new file mode 100644
index 0000000..4d99ee6
--- /dev/null
+++ b/src/bin/Makefile.am
@@ -0,0 +1,18 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+bin_PROGRAMS = elm_theme_viewer
+
+elm_theme_viewer_CPPFLAGS = -I. \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @ELM_THEME_VIEWER_CFLAGS@
+
+elm_theme_viewer_LDADD = @ELM_THEME_VIEWER_LIBS@
+
+elm_theme_viewer_SOURCES = \
+gui.c gui.h \
+log.c log.h \
+theme.c theme.h \
+widget.c widget.h \
+main.c common.h \
+gui_mobile.c gui_mobile.h \
+util.c util.h
diff --git a/src/common.h b/src/bin/common.h
similarity index 100%
rename from src/common.h
rename to src/bin/common.h
diff --git a/src/gui.c b/src/bin/gui.c
similarity index 100%
rename from src/gui.c
rename to src/bin/gui.c
diff --git a/src/gui.h b/src/bin/gui.h
similarity index 100%
rename from src/gui.h
rename to src/bin/gui.h
diff --git a/src/gui_mobile.c b/src/bin/gui_mobile.c
similarity index 100%
rename from src/gui_mobile.c
rename to src/bin/gui_mobile.c
diff --git a/src/gui_mobile.h b/src/bin/gui_mobile.h
similarity index 100%
rename from src/gui_mobile.h
rename to src/bin/gui_mobile.h
diff --git a/src/log.c b/src/bin/log.c
similarity index 100%
rename from src/log.c
rename to src/bin/log.c
diff --git a/src/log.h b/src/bin/log.h
similarity index 100%
rename from src/log.h
rename to src/bin/log.h
diff --git a/src/main.c b/src/bin/main.c
similarity index 100%
rename from src/main.c
rename to src/bin/main.c
diff --git a/src/theme.c b/src/bin/theme.c
similarity index 100%
rename from src/theme.c
rename to src/bin/theme.c
diff --git a/src/theme.h b/src/bin/theme.h
similarity index 100%
rename from src/theme.h
rename to src/bin/theme.h
diff --git a/src/util.c b/src/bin/util.c
similarity index 100%
rename from src/util.c
rename to src/bin/util.c
diff --git a/src/util.h b/src/bin/util.h
similarity index 100%
rename from src/util.h
rename to src/bin/util.h
diff --git a/src/widget.c b/src/bin/widget.c
similarity index 100%
rename from src/widget.c
rename to src/bin/widget.c
diff --git a/src/widget.h b/src/bin/widget.h
similarity index 100%
rename from src/widget.h
rename to src/bin/widget.h