- Moved file handling to curir
- Adapted to index resources