diff --git a/code_snippets/go/develop/myvirtualobject.go b/code_snippets/go/develop/myservice/main.go
similarity index 68%
rename from code_snippets/go/develop/myvirtualobject.go
rename to code_snippets/go/develop/myservice/main.go
index 5724693a..ae39b058 100644
--- a/code_snippets/go/develop/myvirtualobject.go
+++ b/code_snippets/go/develop/myservice/main.go
@@ -1,8 +1,9 @@
-package develop
+package main
 
 import (
 	"context"
 	"fmt"
+	"log"
 
 	restate "github.com/restatedev/sdk-go"
 	server "github.com/restatedev/sdk-go/server"
@@ -14,8 +15,10 @@ func (MyService) MyHandler(ctx restate.Context, greeting string) (string, error)
 	return fmt.Sprintf("%s!", greeting), nil
 }
 
-func serveMyService() {
-	server.NewRestate().
+func main() {
+	if err := server.NewRestate().
 		Bind(restate.Reflect(MyService{})).
-		Start(context.Background(), "0.0.0.0:9080")
+		Start(context.Background(), "0.0.0.0:9080"); err != nil {
+		log.Fatal(err)
+	}
 }
diff --git a/code_snippets/go/develop/myservice.go b/code_snippets/go/develop/myvirtualobject/main.go
similarity index 78%
rename from code_snippets/go/develop/myservice.go
rename to code_snippets/go/develop/myvirtualobject/main.go
index dd927ba0..e05662f4 100644
--- a/code_snippets/go/develop/myservice.go
+++ b/code_snippets/go/develop/myvirtualobject/main.go
@@ -1,8 +1,9 @@
-package develop
+package main
 
 import (
 	"context"
 	"fmt"
+	"log"
 
 	restate "github.com/restatedev/sdk-go"
 	server "github.com/restatedev/sdk-go/server"
@@ -18,8 +19,10 @@ func (MyVirtualObject) MyConcurrentHandler(ctx restate.ObjectSharedContext, gree
 	return fmt.Sprintf("%s %s!", greeting, ctx.Key()), nil
 }
 
-func serveMyVirtualObject() error {
-	return server.NewRestate().
+func main() {
+	if err := server.NewRestate().
 		Bind(restate.Reflect(MyVirtualObject{})).
-		Start(context.Background(), "0.0.0.0:9080")
+		Start(context.Background(), "0.0.0.0:9080"); err != nil {
+		log.Fatal(err)
+	}
 }
diff --git a/code_snippets/go/develop/servinglambda.go b/code_snippets/go/develop/servinglambda.go
index 1ec458fa..6df9c354 100644
--- a/code_snippets/go/develop/servinglambda.go
+++ b/code_snippets/go/develop/servinglambda.go
@@ -9,6 +9,9 @@ import (
 	server "github.com/restatedev/sdk-go/server"
 )
 
+type MyService struct{}
+type MyVirtualObject struct{}
+
 func serveLambda() {
 	// <start_lambda>
 	handler, err := server.NewRestate().
diff --git a/docs/develop/go/overview.mdx b/docs/develop/go/overview.mdx
index 03e018ec..9e4d567a 100644
--- a/docs/develop/go/overview.mdx
+++ b/docs/develop/go/overview.mdx
@@ -23,7 +23,7 @@ Handlers can either be part of a [Service](/concepts/services#services-1), or a
 [Services](/concepts/services#services-1) and their handlers are defined as follows:
 
 ```go
-CODE_LOAD::go/develop/myservice.go
+CODE_LOAD::go/develop/myservice/main.go
 ```
 
 - Define a Service by implementing exported methods on any struct.
@@ -51,7 +51,7 @@ CODE_LOAD::go/develop/myservice.go
 [Virtual Objects](/concepts/services#virtual-objects) and their handlers are defined similarly to services, with the following differences:
 
 ```go
-CODE_LOAD::go/develop/myvirtualobject.go
+CODE_LOAD::go/develop/myvirtualobject/main.go
 ```
 
 - We pass the struct to `restate.Object` instead of `restate.Service`.