minor changes: enhance folder isolation