diff --git a/roadmap/ISSUE_DATAMODEL_OPTIMIZATION_GAMEPLAN.md b/roadmap/eat-the-frog/ISSUE_DATAMODEL_OPTIMIZATION_GAMEPLAN.md
similarity index 100%
rename from roadmap/ISSUE_DATAMODEL_OPTIMIZATION_GAMEPLAN.md
rename to roadmap/eat-the-frog/ISSUE_DATAMODEL_OPTIMIZATION_GAMEPLAN.md
diff --git a/roadmap/eat-the-frog/README.md b/roadmap/eat-the-frog/README.md
new file mode 100644
index 00000000..9174c2f4
--- /dev/null
+++ b/roadmap/eat-the-frog/README.md
@@ -0,0 +1,5 @@
+This is a roadmap topic to swallow whatever leftovers should be done to clean things up regularly.
+
+Before implementing the mixed bag of things should be revisited, organized and stuffed into a workplan 
+with a focus on cleanup with minimal effort. Big and interesting topics should get their own roadmap
+topic directory.
diff --git a/roadmap/RelevantClaudeIssues.md b/roadmap/eat-the-frog/RelevantClaudeIssues.md
similarity index 100%
rename from roadmap/RelevantClaudeIssues.md
rename to roadmap/eat-the-frog/RelevantClaudeIssues.md
diff --git a/roadmap/SCHEMA_EVOLUTION_WORKPLAN.md b/roadmap/schema-evolution/SCHEMA_EVOLUTION_WORKPLAN.md
similarity index 100%
rename from roadmap/SCHEMA_EVOLUTION_WORKPLAN.md
rename to roadmap/schema-evolution/SCHEMA_EVOLUTION_WORKPLAN.md