Created setup
Refactoring classes to make it testable