diff --git a/lua/gopher/init.lua b/lua/gopher/init.lua
index 06faf67..fe86577 100644
--- a/lua/gopher/init.lua
+++ b/lua/gopher/init.lua
@@ -9,12 +9,16 @@ gopher.impl = require("gopher.impl").impl
 gopher.iferr = require("gopher.iferr").iferr
 gopher.comment = require "gopher.comment"
 
-gopher.tags_add = tags.add
-gopher.tags_rm = tags.remove
+gopher.tags = {
+  add = tags.add,
+  rm = tags.remove,
+}
 
-gopher.test_add = tests.func_test
-gopher.test_exported = tests.all_exported_tests
-gopher.tests_all = tests.all_tests
+gopher.test = {
+  add = tests.func_test,
+  exported = tests.all_exported_tests,
+  all = tests.all_tests,
+}
 
 gopher.get = function(...)
   gocmd("get", { ... })
diff --git a/plugin/gopher.vim b/plugin/gopher.vim
index f54d5dd..997ec94 100644
--- a/plugin/gopher.vim
+++ b/plugin/gopher.vim
@@ -1,8 +1,8 @@
-command! -nargs=* GoTagAdd :lua require"gopher".tags_add(<f-args>)
-command! -nargs=* GoTagRm :lua require"gopher".tags_rm(<f-args>)
-command! GoTestAdd :lua require"gopher".test_add()
-command! GoTestsAll :lua require"gopher".tests_all()
-command! GoTestsExp :lua require"gopher".test_exported()
+command! -nargs=* GoTagAdd :lua require"gopher".tags.add(<f-args>)
+command! -nargs=* GoTagRm :lua require"gopher".tags.rm(<f-args>)
+command! GoTestAdd :lua require"gopher".test.add()
+command! GoTestsAll :lua require"gopher".test.all()
+command! GoTestsExp :lua require"gopher".test.exported()
 command! -nargs=* GoMod :lua require"gopher".mod(<f-args>)
 command! -nargs=* GoGet :lua require"gopher".get(<f-args>)
 command! -nargs=* GoWork :lua require"gopher".work(<f-args>)