Fixing some files for refactoring