diff --git a/bindings/go/cmds/notmuch-addrlookup.go b/bindings/go/src/notmuch-addrlookup/addrlookup.go
similarity index 100%
rename from bindings/go/cmds/notmuch-addrlookup.go
rename to bindings/go/src/notmuch-addrlookup/addrlookup.go
diff --git a/bindings/go/pkg/notmuch.go b/bindings/go/src/notmuch/notmuch.go
similarity index 100%
rename from bindings/go/pkg/notmuch.go
rename to bindings/go/src/notmuch/notmuch.go