diff --git a/Makefile.am b/Makefile.am
index 7c3a833..82e2117 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,9 +139,14 @@ dist_man_MANS    = 		\
 	man/pc.5
 
 pkgconf_LDADD    = libpkgconf.la
-pkgconf_SOURCES  = main.c getopt_long.c renderer-msvc.c
-pkgconf_CPPFLAGS = -Ilibpkgconf
-noinst_HEADERS   = getopt_long.h renderer-msvc.h
+pkgconf_SOURCES  = \
+	cli/main.c				\
+	cli/getopt_long.c			\
+	cli/renderer-msvc.c
+pkgconf_CPPFLAGS = -Ilibpkgconf -Icli
+noinst_HEADERS   = \
+	cli/getopt_long.h			\
+	cli/renderer-msvc.h
 
 dist_doc_DATA = README.md AUTHORS
 
diff --git a/getopt_long.c b/cli/getopt_long.c
similarity index 100%
rename from getopt_long.c
rename to cli/getopt_long.c
diff --git a/getopt_long.h b/cli/getopt_long.h
similarity index 100%
rename from getopt_long.h
rename to cli/getopt_long.h
diff --git a/main.c b/cli/main.c
similarity index 100%
rename from main.c
rename to cli/main.c
diff --git a/renderer-msvc.c b/cli/renderer-msvc.c
similarity index 100%
rename from renderer-msvc.c
rename to cli/renderer-msvc.c
diff --git a/renderer-msvc.h b/cli/renderer-msvc.h
similarity index 100%
rename from renderer-msvc.h
rename to cli/renderer-msvc.h