organizing into a single folder wait