Modifying entities for more code reuse and OO organization
Merge branch 'develop' of github.com:Netflix/genie into develop