refactoring, moved classes into packages
refactoring test classes