diff --git a/.gitignore b/.gitignore
index 27327ce..92f19e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ depcomp
 install-sh
 missing
 tallow
-tallow-*.tar.gz
+tallow-*.tar.*
 tallow-*/
 *.o
 tallow.service
diff --git a/Makefile.am b/Makefile.am
index aaa05e2..d678414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,12 @@ systemdsystemunitdir = @SYSTEMD_SYSTEMUNITDIR@
 systemdsystemunit_DATA = data/tallow.service
 
 sbin_PROGRAMS = tallow
-tallow_SOURCES = tallow.c json.c json.h data.c data.h
+tallow_SOURCES = \
+	src/tallow.c \
+	src/json.c \
+	src/json.h \
+	src/data.c \
+	src/data.h
 tallow_LDADD = $(JSON_C_LIBS) $(PCRE_LIBS) $(LIBSYSTEMD_LIBS)
 
 pkgdata_DATA = data/sshd.json
diff --git a/configure.ac b/configure.ac
index 478b044..3410b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@
 
 AC_PREREQ([2.64])
 AC_INIT([tallow], [16], [auke-jan.h.kok@intel.com])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-portability silent-rules subdir-objects color-tests
+	no-dist-gzip dist-xz])
 AC_CONFIG_FILES([Makefile])
 
 # Checks for programs.
diff --git a/data.c b/src/data.c
similarity index 100%
rename from data.c
rename to src/data.c
diff --git a/data.h b/src/data.h
similarity index 100%
rename from data.h
rename to src/data.h
diff --git a/json.c b/src/json.c
similarity index 100%
rename from json.c
rename to src/json.c
diff --git a/json.h b/src/json.h
similarity index 100%
rename from json.h
rename to src/json.h
diff --git a/tallow.c b/src/tallow.c
similarity index 100%
rename from tallow.c
rename to src/tallow.c