Currently no, but I want to structure it in a maintainable way.
Check out Max Kanat-Alexander's piece on over-engineering (10 minute Google video) https://www.youtube.com/watch?v=0wxyOng0-14
In other words, if you're not having maintainability issues with it now, leave it be... once you start having issues, you can re-design (when you actually need it). =)