Removing files for refactoring