Fix organising generator templates