separating into packages, adding a few classes