Refactor classes to match enum entries pattern

[StjepanovicSrdjan]

As described in #348 (comment), some classes and singleton object inherit Enumerable interface indirectly through a parent class, but don't contain companion objects with entries, which causes automated tests for this pattern to fail.