diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 14592231..69771e94 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -100,7 +100,7 @@ local keypress_funcs = {
       end
       return lib.expand_or_collapse(node)
     end
-    return lib.open_file('preview', node.absolute_path)
+    return require'nvim-tree.actions.open-file'.fn('preview', node.absolute_path)
   end,
   system_open = require'nvim-tree.actions.system-open'.fn,
   trash = require'nvim-tree.actions.trash'.fn,
@@ -129,11 +129,11 @@ function M.on_keypress(action)
   end
 
   if node.link_to and not node.entries then
-    lib.open_file(action, node.link_to)
+    require'nvim-tree.actions.open-file'.fn(action, node.link_to)
   elseif node.entries ~= nil then
     lib.expand_or_collapse(node)
   else
-    lib.open_file(action, node.absolute_path)
+    require'nvim-tree.actions.open-file'.fn(action, node.absolute_path)
   end
 end
 
diff --git a/lua/nvim-tree/actions/open-file.lua b/lua/nvim-tree/actions/open-file.lua
new file mode 100644
index 00000000..2df13fc5
--- /dev/null
+++ b/lua/nvim-tree/actions/open-file.lua
@@ -0,0 +1,202 @@
+local api = vim.api
+
+local config = require'nvim-tree.config'
+local lib = require'nvim-tree.lib'
+local utils = require'nvim-tree.utils'
+local view = require'nvim-tree.view'
+
+local M = {}
+
+---Get user to pick a window. Selectable windows are all windows in the current
+---tabpage that aren't NvimTree.
+---@return integer|nil -- If a valid window was picked, return its id. If an
+---       invalid window was picked / user canceled, return nil. If there are
+---       no selectable windows, return -1.
+local function pick_window()
+  local tabpage = api.nvim_get_current_tabpage()
+  local win_ids = api.nvim_tabpage_list_wins(tabpage)
+  local tree_winid = view.get_winnr(tabpage)
+  local exclude = config.window_picker_exclude()
+
+  local selectable = vim.tbl_filter(function (id)
+    local bufid = api.nvim_win_get_buf(id)
+    for option, v in pairs(exclude) do
+      local ok, option_value = pcall(api.nvim_buf_get_option, bufid, option)
+      if ok and vim.tbl_contains(v, option_value) then
+        return false
+      end
+    end
+
+    local win_config = api.nvim_win_get_config(id)
+    return id ~= tree_winid
+      and win_config.focusable
+      and not win_config.external
+  end, win_ids)
+
+  -- If there are no selectable windows: return. If there's only 1, return it without picking.
+  if #selectable == 0 then return -1 end
+  if #selectable == 1 then return selectable[1] end
+
+  local chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+  if vim.g.nvim_tree_window_picker_chars then
+    chars = tostring(vim.g.nvim_tree_window_picker_chars):upper()
+  end
+
+  local i = 1
+  local win_opts = {}
+  local win_map = {}
+  local laststatus = vim.o.laststatus
+  vim.o.laststatus = 2
+
+  -- Setup UI
+  for _, id in ipairs(selectable) do
+    local char = chars:sub(i, i)
+    local ok_status, statusline = pcall(api.nvim_win_get_option, id, "statusline")
+    local ok_hl, winhl = pcall(api.nvim_win_get_option, id, "winhl")
+
+    win_opts[id] = {
+      statusline = ok_status and statusline or "",
+      winhl = ok_hl and winhl or ""
+    }
+    win_map[char] = id
+
+    api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=")
+    api.nvim_win_set_option(
+      id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker"
+    )
+
+    i = i + 1
+    if i > #chars then break end
+  end
+
+  vim.cmd("redraw")
+  print("Pick window: ")
+  local _, resp = pcall(utils.get_user_input_char)
+  resp = (resp or ""):upper()
+  utils.clear_prompt()
+
+  -- Restore window options
+  for _, id in ipairs(selectable) do
+    for opt, value in pairs(win_opts[id]) do
+      api.nvim_win_set_option(id, opt, value)
+    end
+  end
+
+  vim.o.laststatus = laststatus
+
+  return win_map[resp]
+end
+
+local function open_file_in_tab(filename)
+  local close = vim.g.nvim_tree_quit_on_open == 1
+  if close then
+    view.close()
+  else
+    -- Switch window first to ensure new window doesn't inherit settings from
+    -- NvimTree
+    if lib.Tree.target_winid > 0 and api.nvim_win_is_valid(lib.Tree.target_winid) then
+      api.nvim_set_current_win(lib.Tree.target_winid)
+    else
+      vim.cmd("wincmd p")
+    end
+  end
+
+  -- This sequence of commands are here to ensure a number of things: the new
+  -- buffer must be opened in the current tabpage first so that focus can be
+  -- brought back to the tree if it wasn't quit_on_open. It also ensures that
+  -- when we open the new tabpage with the file, its window doesn't inherit
+  -- settings from NvimTree, as it was already loaded.
+
+  vim.cmd("edit " .. vim.fn.fnameescape(filename))
+
+  local alt_bufid = vim.fn.bufnr("#")
+  if alt_bufid ~= -1 then
+    api.nvim_set_current_buf(alt_bufid)
+  end
+
+  if not close then
+    vim.cmd("wincmd p")
+  end
+
+  vim.cmd("tabe " .. vim.fn.fnameescape(filename))
+end
+
+function M.fn(mode, filename)
+  if mode == "tabnew" then
+    open_file_in_tab(filename)
+    return
+  end
+
+  local tabpage = api.nvim_get_current_tabpage()
+  local win_ids = api.nvim_tabpage_list_wins(tabpage)
+
+  local target_winid
+  if vim.g.nvim_tree_disable_window_picker == 1 then
+    target_winid = lib.Tree.target_winid
+  else
+    target_winid = pick_window()
+  end
+
+  if target_winid == -1 then
+    target_winid = lib.Tree.target_winid
+  end
+
+  local do_split = mode == "split" or mode == "vsplit"
+  local vertical = mode ~= "split"
+
+  -- Check if filename is already open in a window
+  local found = false
+  for _, id in ipairs(win_ids) do
+    if filename == api.nvim_buf_get_name(api.nvim_win_get_buf(id)) then
+      if mode == "preview" then return end
+      found = true
+      api.nvim_set_current_win(id)
+      break
+    end
+  end
+
+  if not found then
+    if not target_winid or not vim.tbl_contains(win_ids, target_winid) then
+      -- Target is invalid, or window does not exist in current tabpage: create
+      -- new window
+      local window_opts = config.window_options()
+      local splitside = view.is_vertical() and "vsp" or "sp"
+      vim.cmd(window_opts.split_command .. " " .. splitside)
+      target_winid = api.nvim_get_current_win()
+      lib.Tree.target_winid = target_winid
+
+      -- No need to split, as we created a new window.
+      do_split = false
+    elseif not vim.o.hidden then
+      -- If `hidden` is not enabled, check if buffer in target window is
+      -- modified, and create new split if it is.
+      local target_bufid = api.nvim_win_get_buf(target_winid)
+      if api.nvim_buf_get_option(target_bufid, "modified") then
+        do_split = true
+      end
+    end
+
+    local cmd
+    if do_split then
+      cmd = string.format("%ssplit ", vertical and "vertical " or "")
+    else
+      cmd = "edit "
+    end
+
+    cmd = cmd .. vim.fn.fnameescape(filename)
+    api.nvim_set_current_win(target_winid)
+    vim.cmd(cmd)
+    view.resize()
+  end
+
+  if mode == "preview" then
+    view.focus()
+    return
+  end
+
+  if vim.g.nvim_tree_quit_on_open == 1 then
+    view.close()
+  end
+end
+
+return M
diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua
index 7fc80d5e..1bde3874 100644
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -2,7 +2,6 @@ local api = vim.api
 local luv = vim.loop
 
 local renderer = require'nvim-tree.renderer'
-local config = require'nvim-tree.config'
 local diagnostics = require'nvim-tree.diagnostics'
 local pops = require'nvim-tree.populate'
 local utils = require'nvim-tree.utils'
@@ -247,198 +246,6 @@ function M.set_index_and_redraw(fname)
   end
 end
 
----Get user to pick a window. Selectable windows are all windows in the current
----tabpage that aren't NvimTree.
----@return integer|nil -- If a valid window was picked, return its id. If an
----       invalid window was picked / user canceled, return nil. If there are
----       no selectable windows, return -1.
-function M.pick_window()
-  local tabpage = api.nvim_get_current_tabpage()
-  local win_ids = api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = view.get_winnr(tabpage)
-  local exclude = config.window_picker_exclude()
-
-  local selectable = vim.tbl_filter(function (id)
-    local bufid = api.nvim_win_get_buf(id)
-    for option, v in pairs(exclude) do
-      local ok, option_value = pcall(api.nvim_buf_get_option, bufid, option)
-      if ok and vim.tbl_contains(v, option_value) then
-        return false
-      end
-    end
-
-    local win_config = api.nvim_win_get_config(id)
-    return id ~= tree_winid
-      and win_config.focusable
-      and not win_config.external
-  end, win_ids)
-
-  -- If there are no selectable windows: return. If there's only 1, return it without picking.
-  if #selectable == 0 then return -1 end
-  if #selectable == 1 then return selectable[1] end
-
-  local chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
-  if vim.g.nvim_tree_window_picker_chars then
-    chars = tostring(vim.g.nvim_tree_window_picker_chars):upper()
-  end
-
-  local i = 1
-  local win_opts = {}
-  local win_map = {}
-  local laststatus = vim.o.laststatus
-  vim.o.laststatus = 2
-
-  -- Setup UI
-  for _, id in ipairs(selectable) do
-    local char = chars:sub(i, i)
-    local ok_status, statusline = pcall(api.nvim_win_get_option, id, "statusline")
-    local ok_hl, winhl = pcall(api.nvim_win_get_option, id, "winhl")
-
-    win_opts[id] = {
-      statusline = ok_status and statusline or "",
-      winhl = ok_hl and winhl or ""
-    }
-    win_map[char] = id
-
-    api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=")
-    api.nvim_win_set_option(
-      id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker"
-    )
-
-    i = i + 1
-    if i > #chars then break end
-  end
-
-  vim.cmd("redraw")
-  print("Pick window: ")
-  local _, resp = pcall(utils.get_user_input_char)
-  resp = (resp or ""):upper()
-  utils.clear_prompt()
-
-  -- Restore window options
-  for _, id in ipairs(selectable) do
-    for opt, value in pairs(win_opts[id]) do
-      api.nvim_win_set_option(id, opt, value)
-    end
-  end
-
-  vim.o.laststatus = laststatus
-
-  return win_map[resp]
-end
-
-function M.open_file(mode, filename)
-  if mode == "tabnew" then
-    M.open_file_in_tab(filename)
-    return
-  end
-
-  local tabpage = api.nvim_get_current_tabpage()
-  local win_ids = api.nvim_tabpage_list_wins(tabpage)
-
-  local target_winid
-  if vim.g.nvim_tree_disable_window_picker == 1 then
-    target_winid = M.Tree.target_winid
-  else
-    target_winid = M.pick_window()
-  end
-
-  if target_winid == -1 then
-    target_winid = M.Tree.target_winid
-  end
-
-  local do_split = mode == "split" or mode == "vsplit"
-  local vertical = mode ~= "split"
-
-  -- Check if filename is already open in a window
-  local found = false
-  for _, id in ipairs(win_ids) do
-    if filename == api.nvim_buf_get_name(api.nvim_win_get_buf(id)) then
-      if mode == "preview" then return end
-      found = true
-      api.nvim_set_current_win(id)
-      break
-    end
-  end
-
-  if not found then
-    if not target_winid or not vim.tbl_contains(win_ids, target_winid) then
-      -- Target is invalid, or window does not exist in current tabpage: create
-      -- new window
-      local window_opts = config.window_options()
-      local splitside = view.is_vertical() and "vsp" or "sp"
-      vim.cmd(window_opts.split_command .. " " .. splitside)
-      target_winid = api.nvim_get_current_win()
-      M.Tree.target_winid = target_winid
-
-      -- No need to split, as we created a new window.
-      do_split = false
-    elseif not vim.o.hidden then
-      -- If `hidden` is not enabled, check if buffer in target window is
-      -- modified, and create new split if it is.
-      local target_bufid = api.nvim_win_get_buf(target_winid)
-      if api.nvim_buf_get_option(target_bufid, "modified") then
-        do_split = true
-      end
-    end
-
-    local cmd
-    if do_split then
-      cmd = string.format("%ssplit ", vertical and "vertical " or "")
-    else
-      cmd = "edit "
-    end
-
-    cmd = cmd .. vim.fn.fnameescape(filename)
-    api.nvim_set_current_win(target_winid)
-    vim.cmd(cmd)
-    view.resize()
-  end
-
-  if mode == "preview" then
-    view.focus()
-    return
-  end
-
-  if vim.g.nvim_tree_quit_on_open == 1 then
-    view.close()
-  end
-end
-
-function M.open_file_in_tab(filename)
-  local close = vim.g.nvim_tree_quit_on_open == 1
-  if close then
-    view.close()
-  else
-    -- Switch window first to ensure new window doesn't inherit settings from
-    -- NvimTree
-    if M.Tree.target_winid > 0 and api.nvim_win_is_valid(M.Tree.target_winid) then
-      api.nvim_set_current_win(M.Tree.target_winid)
-    else
-      vim.cmd("wincmd p")
-    end
-  end
-
-  -- This sequence of commands are here to ensure a number of things: the new
-  -- buffer must be opened in the current tabpage first so that focus can be
-  -- brought back to the tree if it wasn't quit_on_open. It also ensures that
-  -- when we open the new tabpage with the file, its window doesn't inherit
-  -- settings from NvimTree, as it was already loaded.
-
-  vim.cmd("edit " .. vim.fn.fnameescape(filename))
-
-  local alt_bufid = vim.fn.bufnr("#")
-  if alt_bufid ~= -1 then
-    api.nvim_set_current_buf(alt_bufid)
-  end
-
-  if not close then
-    vim.cmd("wincmd p")
-  end
-
-  vim.cmd("tabe " .. vim.fn.fnameescape(filename))
-end
-
 function M.collapse_all()
   local function iter(nodes)
     for _, node in pairs(nodes) do