From c05991399aa597e94f3f8d4f8b57a85504f3962c Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 10 Mar 2026 11:17:09 -0400
Subject: [PATCH] Code reorg.

---
 Makefile                             |  6 +++---
 meson.build                          | 13 ++++++++-----
 constants.hpp => src/constants.hpp   |  0
 control_ui.cpp => src/control_ui.cpp |  0
 control_ui.hpp => src/control_ui.hpp |  0
 dbc.cpp => src/dbc.cpp               |  0
 dbc.hpp => src/dbc.hpp               |  0
 main.cpp => src/main.cpp             |  2 +-
 md_parser.cpp => src/md_parser.cpp   |  0
 md_parser.rl => src/md_parser.rl     |  0
 parser.cpp => src/parser.cpp         |  0
 parser.hpp => src/parser.hpp         |  0
 slides_ui.cpp => src/slides_ui.cpp   |  0
 slides_ui.hpp => src/slides_ui.hpp   |  1 -
 wraps/lel-guecs.wrap                 |  2 +-
 15 files changed, 13 insertions(+), 11 deletions(-)
 rename constants.hpp => src/constants.hpp (100%)
 rename control_ui.cpp => src/control_ui.cpp (100%)
 rename control_ui.hpp => src/control_ui.hpp (100%)
 rename dbc.cpp => src/dbc.cpp (100%)
 rename dbc.hpp => src/dbc.hpp (100%)
 rename main.cpp => src/main.cpp (96%)
 rename md_parser.cpp => src/md_parser.cpp (100%)
 rename md_parser.rl => src/md_parser.rl (100%)
 rename parser.cpp => src/parser.cpp (100%)
 rename parser.hpp => src/parser.hpp (100%)
 rename slides_ui.cpp => src/slides_ui.cpp (100%)
 rename slides_ui.hpp => src/slides_ui.hpp (96%)

diff --git a/Makefile b/Makefile
index 664ff4e..e8e4e01 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ endif
 %.cpp : %.rl
 	ragel -o $@ $<
 
-build: $(ROOT_DIR)/md_parser.cpp
+build: $(ROOT_DIR)/src/md_parser.cpp
 	meson compile -j 10 -C $(ROOT_DIR)/builddir
 
 release_build:
@@ -26,8 +26,8 @@ debug_build:
 
 run: build
 ifeq '$(OS)' 'Windows_NT'
-	powershell "cp ./builddir/besos.exe ."
-	./besos ${SAMPLE}
+	powershell "cp ./builddir/bezos.exe ."
+	./bezos ${SAMPLE}
 else
 	./builddir/besos ${SAMPLE}
 endif
diff --git a/meson.build b/meson.build
index ffca859..2d23244 100644
--- a/meson.build
+++ b/meson.build
@@ -79,25 +79,28 @@ dependencies += [
   sfml_window, lel_guecs, lel_guecs_sfml
 ]
 
+
 sources = [
-  'dbc.cpp',
-  'control_ui.cpp',
-  'slides_ui.cpp',
-  'parser.cpp',
+  'src/dbc.cpp',
+  'src/control_ui.cpp',
+  'src/slides_ui.cpp',
+  'src/parser.cpp',
 ]
 
 tests = [
   'tests/parsing.cpp'
 ]
 
-executable('bezos', sources + ['main.cpp'],
+executable('bezos', sources + ['src/main.cpp'],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: include_directories('src'),
   override_options: exe_defaults,
   dependencies: dependencies)
 
 executable('runtests', sources + tests,
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: include_directories('src'),
   override_options: exe_defaults,
   dependencies: dependencies + [catch2])
diff --git a/constants.hpp b/src/constants.hpp
similarity index 100%
rename from constants.hpp
rename to src/constants.hpp
diff --git a/control_ui.cpp b/src/control_ui.cpp
similarity index 100%
rename from control_ui.cpp
rename to src/control_ui.cpp
diff --git a/control_ui.hpp b/src/control_ui.hpp
similarity index 100%
rename from control_ui.hpp
rename to src/control_ui.hpp
diff --git a/dbc.cpp b/src/dbc.cpp
similarity index 100%
rename from dbc.cpp
rename to src/dbc.cpp
diff --git a/dbc.hpp b/src/dbc.hpp
similarity index 100%
rename from dbc.hpp
rename to src/dbc.hpp
diff --git a/main.cpp b/src/main.cpp
similarity index 96%
rename from main.cpp
rename to src/main.cpp
index 1e72e45..7a39f14 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -8,7 +8,7 @@
 #include "parser.hpp"
 
 int main(int argc, char *argv[]) {
-  dbc::check(argc >= 2, "USAGE: besos my_fucking_slides.md");
+  dbc::check(argc >= 2, "USAGE: bezos my_fucking_slides.md");
 
   sfml::Backend backend;
   guecs::init(&backend);
diff --git a/md_parser.cpp b/src/md_parser.cpp
similarity index 100%
rename from md_parser.cpp
rename to src/md_parser.cpp
diff --git a/md_parser.rl b/src/md_parser.rl
similarity index 100%
rename from md_parser.rl
rename to src/md_parser.rl
diff --git a/parser.cpp b/src/parser.cpp
similarity index 100%
rename from parser.cpp
rename to src/parser.cpp
diff --git a/parser.hpp b/src/parser.hpp
similarity index 100%
rename from parser.hpp
rename to src/parser.hpp
diff --git a/slides_ui.cpp b/src/slides_ui.cpp
similarity index 100%
rename from slides_ui.cpp
rename to src/slides_ui.cpp
diff --git a/slides_ui.hpp b/src/slides_ui.hpp
similarity index 96%
rename from slides_ui.hpp
rename to src/slides_ui.hpp
index 64580d8..71dff67 100644
--- a/slides_ui.hpp
+++ b/src/slides_ui.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "guecs/sfml/backend.hpp"
 #include "guecs/sfml/components.hpp"
 #include "guecs/ui.hpp"
 #include <nlohmann/json.hpp>
diff --git a/wraps/lel-guecs.wrap b/wraps/lel-guecs.wrap
index caa2e42..8c799b5 100644
--- a/wraps/lel-guecs.wrap
+++ b/wraps/lel-guecs.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
-directory=lel-guecs-0.6.0
+directory=lel-guecs-0.7.0
 url=https://git.learnjsthehardway.com/learn-code-the-hard-way/lel-guecs.git
 revision=HEAD
 depth=1