Slight DI rearrangement and made it where file/dir-reopen via SSH works correctly