diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f8602d..60d92bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ ADD_SUBDIRECTORY(libpkgconf)
 #-------- Build and install executable --------
 
 INCLUDE_DIRECTORIES(${libpkgconf_BINARY_DIR})
-ADD_EXECUTABLE(pkgconf main.c getopt_long.c renderer-msvc.c)
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Icli")
+ADD_EXECUTABLE(pkgconf cli/main.c cli/getopt_long.c cli/renderer-msvc.c)
 TARGET_LINK_LIBRARIES(pkgconf libpkgconf)
 INSTALL(TARGETS pkgconf DESTINATION bin)
 
diff --git a/meson.build b/meson.build
index 72eff19..afb5cf9 100644
--- a/meson.build
+++ b/meson.build
@@ -77,9 +77,9 @@ libpkgconf = shared_library('pkgconf',
 
 
 pkgconf_exe = executable('pkgconf',
-  'main.c',
-  'getopt_long.c',
-  'renderer-msvc.c',
+  'cli/main.c',
+  'cli/getopt_long.c',
+  'cli/renderer-msvc.c',
   link_with : libpkgconf,
   install : true)