Orgs refactored
Merge pull request #599 from WarnerMusicGroup/Model_constructor_refactoring

Orgs refactored