FilePicker 90% refactored