Files repository plugin refactoring
Files repository plugin refactoring, continued
Files repository plugin refactoring, continued