generation manager structure improved
16 files changed