removed duplicate files after refactor
Merge branch 'refactor'