finder updates, removed 'all' in functions, and rearranged files for finder merge