encapsulated result export
refactoring of packages and model class
fixing broken unit tests