Switched project to parent structure

 - removed duplicate code