Refactoring files removed