Add DisposableDirPath for neater cleanup logic