Re-ordered generator file