Reorganizing classes
Refactoring class Variable and related classes