Adding /target folder
Refactoring to abstract class