Open file -> Open file(s) and various refactoring