minor code clean up
extract folder stuff to FolderBrowserHelper