[refactor] Preparing to handle folder output differently.