generation manager structure improved
10 files changed