Test classes added, divided code into packages