small changes to test rebasing
Refactoring and created some needed classes