Re-organises core generators.