put classes into packages added extra command class