little refactoring
more refactorings
moving class to other package
fixing matchers