Index files' refactoring