Add classes Generation and SubjectList
Small refactor
Refactor output