Make index less aware of file structure