Reorganize a bit to prepare for AI