Functional folder selection, a little bit of cleanup.