Ah, 7DRL coding :P
Every time I do 7DRL I think I will come up with a clean architecture based on past lessons, and have somewhat succeeded for UI and some other supporting code, but not at all for core game logic.