generation manager structure improved
8 files changed