Move methods to own classes

Collection
Company
Genre
Keyword