diff --git a/Makefile.am b/Makefile.am
index 2162eb6..41667e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,31 +1,5 @@
-bin_PROGRAMS = anticol list mftool relay emulate
-
-# set the include path found by configure
-INCLUDES= $(all_includes)
-
-nfcinclude_HEADERS = libnfc.h bitutils.h defines.h dev_acr122.h dev_pn531.h types.h mifaretag.h devices.h
-nfcincludedir = $(includedir)/libnfc
-
-lib_LTLIBRARIES = libnfc.la
-
-libnfc_la_CFLAGS = @LIBUSB_CFLAGS@ @LIBPCSCLITE_CFLAGS@
-libnfc_la_SOURCES = dev_pn531.c dev_acr122.c bitutils.c libnfc.c
-libnfc_la_LIBADD = @LIBUSB_LIBS@ @LIBPCSCLITE_LIBS@
+SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnfc.pc
 
-anticol_SOURCES = anticol.c
-anticol_LDADD = libnfc.la
-
-list_SOURCES = list.c
-list_LDADD = libnfc.la
-
-mftool_SOURCES = mftool.c
-mftool_LDADD = libnfc.la
-
-relay_SOURCES = relay.c
-relay_LDADD = libnfc.la
-
-emulate_SOURCES = emulate.c
-emulate_LDADD = libnfc.la
diff --git a/configure.ac b/configure.ac
index 5a4cae8..73042c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_SUBST(LIBPCSCLITE_CFLAGS)
 
 AC_CONFIG_FILES([
 		Makefile
+		src/Makefile
 		libnfc.pc
 		])
 
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..d1e02c3
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,28 @@
+bin_PROGRAMS = anticol list mftool relay emulate
+
+# set the include path found by configure
+INCLUDES= $(all_includes)
+
+nfcinclude_HEADERS = libnfc.h bitutils.h defines.h dev_acr122.h dev_pn531.h types.h mifaretag.h devices.h
+nfcincludedir = $(includedir)/libnfc
+
+lib_LTLIBRARIES = libnfc.la
+
+libnfc_la_CFLAGS = @LIBUSB_CFLAGS@ @LIBPCSCLITE_CFLAGS@
+libnfc_la_SOURCES = dev_pn531.c dev_acr122.c bitutils.c libnfc.c
+libnfc_la_LIBADD = @LIBUSB_LIBS@ @LIBPCSCLITE_LIBS@
+
+anticol_SOURCES = anticol.c
+anticol_LDADD = libnfc.la
+
+list_SOURCES = list.c
+list_LDADD = libnfc.la
+
+mftool_SOURCES = mftool.c
+mftool_LDADD = libnfc.la
+
+relay_SOURCES = relay.c
+relay_LDADD = libnfc.la
+
+emulate_SOURCES = emulate.c
+emulate_LDADD = libnfc.la
diff --git a/anticol.c b/src/anticol.c
similarity index 100%
rename from anticol.c
rename to src/anticol.c
diff --git a/bitutils.c b/src/bitutils.c
similarity index 100%
rename from bitutils.c
rename to src/bitutils.c
diff --git a/bitutils.h b/src/bitutils.h
similarity index 100%
rename from bitutils.h
rename to src/bitutils.h
diff --git a/defines.h b/src/defines.h
similarity index 100%
rename from defines.h
rename to src/defines.h
diff --git a/dev_acr122.c b/src/dev_acr122.c
similarity index 100%
rename from dev_acr122.c
rename to src/dev_acr122.c
diff --git a/dev_acr122.h b/src/dev_acr122.h
similarity index 100%
rename from dev_acr122.h
rename to src/dev_acr122.h
diff --git a/dev_pn531.c b/src/dev_pn531.c
similarity index 100%
rename from dev_pn531.c
rename to src/dev_pn531.c
diff --git a/dev_pn531.h b/src/dev_pn531.h
similarity index 100%
rename from dev_pn531.h
rename to src/dev_pn531.h
diff --git a/devices.h b/src/devices.h
similarity index 100%
rename from devices.h
rename to src/devices.h
diff --git a/emulate.c b/src/emulate.c
similarity index 100%
rename from emulate.c
rename to src/emulate.c
diff --git a/libnfc.c b/src/libnfc.c
similarity index 100%
rename from libnfc.c
rename to src/libnfc.c
diff --git a/libnfc.h b/src/libnfc.h
similarity index 100%
rename from libnfc.h
rename to src/libnfc.h
diff --git a/list.c b/src/list.c
similarity index 100%
rename from list.c
rename to src/list.c
diff --git a/mftool.c b/src/mftool.c
similarity index 100%
rename from mftool.c
rename to src/mftool.c
diff --git a/mifaretag.h b/src/mifaretag.h
similarity index 100%
rename from mifaretag.h
rename to src/mifaretag.h
diff --git a/relay.c b/src/relay.c
similarity index 100%
rename from relay.c
rename to src/relay.c
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h