diff --git a/configure.ac b/configure.ac
index 3bd56eb..2c6ece1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,5 +41,5 @@ PKG_CHECK_MODULES([LIBNFC], [libnfc], [], [AC_MSG_ERROR([libnfc is mandatory.])]
 PKG_CONFIG_REQUIRES="libnfc"
 AC_SUBST([PKG_CONFIG_REQUIRES])
 
-AC_OUTPUT([Makefile libfreefare.pc])
+AC_OUTPUT([Makefile libfreefare/Makefile libfreefare.pc])
 
diff --git a/Makefile.am b/libfreefare/Makefile.am
similarity index 81%
rename from Makefile.am
rename to libfreefare/Makefile.am
index b08082b..c34ad35 100644
--- a/Makefile.am
+++ b/libfreefare/Makefile.am
@@ -11,6 +11,3 @@ libfreefare_la_HEADERS = freefare.h
 libfreefare_ladir = $(includedir)
 
 EXTRA_DIST = freefare_internal.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libfreefare.pc
diff --git a/freefare.h b/libfreefare/freefare.h
similarity index 100%
rename from freefare.h
rename to libfreefare/freefare.h
diff --git a/freefare_internal.h b/libfreefare/freefare_internal.h
similarity index 100%
rename from freefare_internal.h
rename to libfreefare/freefare_internal.h
diff --git a/mad.c b/libfreefare/mad.c
similarity index 100%
rename from mad.c
rename to libfreefare/mad.c
diff --git a/mifare_application.c b/libfreefare/mifare_application.c
similarity index 100%
rename from mifare_application.c
rename to libfreefare/mifare_application.c
diff --git a/mifare_classic.c b/libfreefare/mifare_classic.c
similarity index 100%
rename from mifare_classic.c
rename to libfreefare/mifare_classic.c
diff --git a/test/Makefile b/test/Makefile
index 15dadb8..fb6d06f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,8 +1,10 @@
-LMF_SRCDIR=	${.CURDIR}/..
+LMF_SRCDIR=	${.CURDIR}/../libfreefare
 .PATH:		${LMF_SRCDIR}
 
 #LMF_SRCS!=	${MAKE} -f ${LMF_SRCDIR}/Makefile -V SRCS
-LMF_SRCS=	../mifare_classic.c ../mad.c ../mifare_application.c
+LMF_SRCS=	${LMF_SRCDIR}/mifare_classic.c \
+		${LMF_SRCDIR}/mad.c \
+		${LMF_SRCDIR}/mifare_application.c
 
 TESTS=		test_read_sector_0.c \
 		test_authenticate.c \
@@ -30,7 +32,7 @@ LDADD+=		-lnfc
 CFLAGS+=	-std=c99
 CFLAGS+=	-ggdb
 CFLAGS+=	-Wall -pedantic
-CFLAGS+=	-I${LMF_SRCDIR} -I.
+CFLAGS+=	-I${LMF_SRCDIR} -I. -I..
 
 .PHONY: check test
 check test: libfreefare_test
diff --git a/test/test_mad.c b/test/test_mad.c
index e971fa8..f9d7d12 100644
--- a/test/test_mad.c
+++ b/test/test_mad.c
@@ -1,6 +1,6 @@
 #include "test.h"
 
-#include "../freefare_internal.h"
+#include "freefare_internal.h"
 
 DEFINE_TEST(test_mad)
 {