Reorder classes
Merge pull request #52 from contentful/iss43

Reorder classes