diff --git a/Makefile.am b/Makefile.am
index 853924c..bf3b49e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,2 @@
-
-bin_PROGRAMS = rtp2httpd
-
-rtp2httpd_SOURCES = rtp2httpd.c httpclients.c configfile.c
-
-noinst_HEADERS = rtp2httpd.h
-
-AM_CFLAGS= -DSYSCONFDIR=\"@sysconfdir@\"
+SUBDIRS = src
 dist_sysconf_DATA = rtp2httpd.conf
diff --git a/configure.ac b/configure.ac
index c98916c..618086f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([rtp2httpd],[1.0])
-AC_CONFIG_SRCDIR([rtp2httpd.c])
+AC_CONFIG_SRCDIR([src/rtp2httpd.c])
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(src/config.h)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -24,8 +24,8 @@ CONFFILE_DIR=`(
 )`
 AC_DEFINE_UNQUOTED(CONFPATH, "$CONFFILE_DIR", system config directory)
 
+AC_CONFIG_FILES([Makefile src/Makefile])
 
-AC_OUTPUT(Makefile)
-echo -e "\nAll done. Run make now."
-
+AC_OUTPUT
 
+echo -e "\nAll done. Run make now."
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..884b7f4
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,8 @@
+
+bin_PROGRAMS = rtp2httpd
+
+rtp2httpd_SOURCES = rtp2httpd.c httpclients.c configuration.c
+
+noinst_HEADERS = rtp2httpd.h
+
+AM_CFLAGS= -DSYSCONFDIR=\"@sysconfdir@\"
diff --git a/configfile.c b/src/configuration.c
similarity index 100%
rename from configfile.c
rename to src/configuration.c
diff --git a/httpclients.c b/src/httpclients.c
similarity index 100%
rename from httpclients.c
rename to src/httpclients.c
diff --git a/rtp2httpd.c b/src/rtp2httpd.c
similarity index 100%
rename from rtp2httpd.c
rename to src/rtp2httpd.c
diff --git a/rtp2httpd.h b/src/rtp2httpd.h
similarity index 100%
rename from rtp2httpd.h
rename to src/rtp2httpd.h