diff --git a/.gitignore b/.gitignore
index 71797e17..2df731ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,14 +54,10 @@ out/
 !include/ftxui/**/*.cpp
 
 # src directory:
+!src/ftxui/*.cppm
 !src/ftxui/**/*.hpp
 !src/ftxui/**/*.cpp
-
-# modules directory:
-!modules/*.txt
-!modules/ftxui/*.cppm
-!modules/ftxui/*.txt
-!modules/ftxui/**/*.cppm
+!src/ftxui/**/*.cppm
 
 # tools directory:
 !tools/**/*.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b2f366e..f8a13bab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,9 @@ option(FTXUI_ENABLE_INSTALL "Generate the install target" ON)
 option(FTXUI_QUIET "Set to ON for FTXUI to be quiet" OFF)
 
 if (FTXUI_BUILD_MODULES)
-  cmake_minimum_required(VERSION 3.12)
-else()
   cmake_minimum_required(VERSION 3.28.2)
+else()
+  cmake_minimum_required(VERSION 3.12)
 endif()
 
 project(ftxui
diff --git a/src/ftxui/ftxui.cppm b/src/ftxui/ftxui.cppm
new file mode 100644
index 00000000..effab708
--- /dev/null
+++ b/src/ftxui/ftxui.cppm
@@ -0,0 +1,11 @@
+/**
+ * @file ftxui.cppm
+ * @brief Module file re-exporting all FTXUI submodules.
+ */
+
+export module ftxui;
+
+export import ftxui.component;
+export import ftxui.dom;
+export import ftxui.screen;
+export import ftxui.util;