Clean up generator layout
Refactored generator discovery.