diff --git a/Makefile.am b/Makefile.am
index cfb1e05..d4e0935 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = glorytun
-glorytun_SOURCES = main.c option.c option.h common.h common-static.h
+glorytun_SOURCES = src/common.h src/common-static.h src/main.c src/option.c src/option.h
 glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
diff --git a/configure.ac b/configure.ac
index 5652ede..9030ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,10 @@ AC_INIT([glorytun], [0.0.1],
         [https://github.com/angt/glorytun/issues],
         [glorytun],
         [https://github.com/angt/glorytun])
-AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar])
+AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
 AM_DEP_TRACK
 AM_SILENT_RULES([yes])
-AC_CONFIG_SRCDIR([common.h])
+AC_CONFIG_SRCDIR([src/common.h])
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])
diff --git a/common-static.h b/src/common-static.h
similarity index 100%
rename from common-static.h
rename to src/common-static.h
diff --git a/common.h b/src/common.h
similarity index 100%
rename from common.h
rename to src/common.h
diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/option.c b/src/option.c
similarity index 100%
rename from option.c
rename to src/option.c
diff --git a/option.h b/src/option.h
similarity index 100%
rename from option.h
rename to src/option.h