diff --git a/common.mk b/common.mk
index 5f29944..3817f24 100644
--- a/common.mk
+++ b/common.mk
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/packaging \
 	-I $(top_srcdir)/src/library \
+	-I $(top_srcdir)/src/output \
 	-DDATA_DIRECTORY=\"$(datadir)/cve-check-tool\" \
 	-DSITE_PATH=\"$(sysconfdir)\" -DDEFAULT_PATH=\"$(datadir)/defaults/cve-check-tool\" \
 	-DTOP_DIR=\"$(abs_top_srcdir)\"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3122960..73a5b6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,12 +8,12 @@ bin_PROGRAMS = cve-check-tool
 
 cve_check_tool_SOURCES = \
 	main.c \
-	html.c \
-	html.h \
-	cli.c \
-	cli.h \
-	csv.c \
-	csv.h \
+	output/cli.c \
+	output/cli.h \
+	output/csv.c \
+	output/csv.h \
+	output/html.c \
+	output/html.h \
 	library/cve-check-tool.h \
 	library/cve-string.h \
 	library/cve-string.c \
diff --git a/src/cli.c b/src/output/cli.c
similarity index 100%
rename from src/cli.c
rename to src/output/cli.c
diff --git a/src/cli.h b/src/output/cli.h
similarity index 100%
rename from src/cli.h
rename to src/output/cli.h
diff --git a/src/csv.c b/src/output/csv.c
similarity index 100%
rename from src/csv.c
rename to src/output/csv.c
diff --git a/src/csv.h b/src/output/csv.h
similarity index 100%
rename from src/csv.h
rename to src/output/csv.h
diff --git a/src/html.c b/src/output/html.c
similarity index 100%
rename from src/html.c
rename to src/output/html.c
diff --git a/src/html.h b/src/output/html.h
similarity index 100%
rename from src/html.h
rename to src/output/html.h