Separated classes for different agents into packages