removed unnecessary repeated files
refactored code
More refactoring