Re-factored Java Variable System into packages