Modular generator updates...
Updates for modular project structure