Completely reorganize Aenea.