package refactoring
tests fixed
refactoring of builders
refactoring of builders