Undo consolidation of variables with classes.
Merge pull request #2 from jina/master

Undo consolidation of variables with classes.