diff --git a/examples/app/README.md b/examples/app/README.md
index 47d0f0f..9cfe535 100755
--- a/examples/app/README.md
+++ b/examples/app/README.md
@@ -4,93 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/app/api](https
 
 Endpoints:
 
-## Reserve
-
-Reserve apps beyond the free quota. Call Run after.
-
-
-[https://m3o.com/app/api#Reserve](https://m3o.com/app/api#Reserve)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/app"
-)
-
-// Reserve apps beyond the free quota. Call Run after.
-func ReserveAppName() {
-	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := appService.Reserve(&app.ReserveRequest{
-		Name: "helloworld",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## List
-
-List all the apps
-
-
-[https://m3o.com/app/api#List](https://m3o.com/app/api#List)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/app"
-)
-
-// List all the apps
-func ListTheApps() {
-	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := appService.List(&app.ListRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Run
-
-Run an app from source
-
-
-[https://m3o.com/app/api#Run](https://m3o.com/app/api#Run)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/app"
-)
-
-// Run an app from source
-func RunAnApp() {
-	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := appService.Run(&app.RunRequest{
-		Branch: "master",
-Name: "helloworld",
-Port: 8080,
-Region: "europe-west1",
-Repo: "github.com/asim/helloworld",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Regions
 
 Return the support regions
@@ -230,3 +143,90 @@ func DeleteAnApp() {
 	
 }
 ```
+## Reserve
+
+Reserve apps beyond the free quota. Call Run after.
+
+
+[https://m3o.com/app/api#Reserve](https://m3o.com/app/api#Reserve)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/app"
+)
+
+// Reserve apps beyond the free quota. Call Run after.
+func ReserveAppName() {
+	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := appService.Reserve(&app.ReserveRequest{
+		Name: "helloworld",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## List
+
+List all the apps
+
+
+[https://m3o.com/app/api#List](https://m3o.com/app/api#List)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/app"
+)
+
+// List all the apps
+func ListTheApps() {
+	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := appService.List(&app.ListRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Run
+
+Run an app from source
+
+
+[https://m3o.com/app/api#Run](https://m3o.com/app/api#Run)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/app"
+)
+
+// Run an app from source
+func RunAnApp() {
+	appService := app.NewAppService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := appService.Run(&app.RunRequest{
+		Branch: "master",
+Name: "helloworld",
+Port: 8080,
+Region: "europe-west1",
+Repo: "github.com/asim/helloworld",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/cache/README.md b/examples/cache/README.md
index 359c982..b6e7759 100755
--- a/examples/cache/README.md
+++ b/examples/cache/README.md
@@ -4,6 +4,33 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/cache/api](htt
 
 Endpoints:
 
+## ListKeys
+
+List all the available keys
+
+
+[https://m3o.com/cache/api#ListKeys](https://m3o.com/cache/api#ListKeys)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/cache"
+)
+
+// List all the available keys
+func ListTheKeys() {
+	cacheService := cache.NewCacheService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := cacheService.ListKeys(&cache.ListKeysRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Set
 
 Set an item in the cache. Overwrites any existing value already set.
@@ -147,30 +174,3 @@ Value: 2,
 	
 }
 ```
-## ListKeys
-
-List all the available keys
-
-
-[https://m3o.com/cache/api#ListKeys](https://m3o.com/cache/api#ListKeys)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/cache"
-)
-
-// List all the available keys
-func ListTheKeys() {
-	cacheService := cache.NewCacheService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := cacheService.ListKeys(&cache.ListKeysRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/contact/README.md b/examples/contact/README.md
index 878f816..e52974c 100755
--- a/examples/contact/README.md
+++ b/examples/contact/README.md
@@ -4,57 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/contact/api](h
 
 Endpoints:
 
-## Update
-
-
-
-
-[https://m3o.com/contact/api#Update](https://m3o.com/contact/api#Update)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/contact"
-)
-
-// 
-func UpdateAcontact() {
-	contactService := contact.NewContactService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := contactService.Update(&contact.UpdateRequest{
-		Addresses: []contact.Address{
-contact.Address{
-		Label: "company address",
-		Location: "123 street address",
-}},
-Birthday: "1995-01-01",
-Emails: []contact.Email{
-contact.Email{
-		Address: "home@example.com",
-		Label: "home",
-}},
-Id: "42e48a3c-6221-11ec-96d2-acde48001122",
-Links: []contact.Link{
-contact.Link{
-		Label: "blog",
-		Url: "https://blog.joe.me",
-}},
-Name: "joe",
-Note: "this person is very important",
-Phones: []contact.Phone{
-contact.Phone{
-		Label: "home",
-		Number: "010-12345678",
-}},
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Read
 
 
@@ -217,3 +166,54 @@ contact.Phone{
 	
 }
 ```
+## Update
+
+
+
+
+[https://m3o.com/contact/api#Update](https://m3o.com/contact/api#Update)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/contact"
+)
+
+// 
+func UpdateAcontact() {
+	contactService := contact.NewContactService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := contactService.Update(&contact.UpdateRequest{
+		Addresses: []contact.Address{
+contact.Address{
+		Label: "company address",
+		Location: "123 street address",
+}},
+Birthday: "1995-01-01",
+Emails: []contact.Email{
+contact.Email{
+		Address: "home@example.com",
+		Label: "home",
+}},
+Id: "42e48a3c-6221-11ec-96d2-acde48001122",
+Links: []contact.Link{
+contact.Link{
+		Label: "blog",
+		Url: "https://blog.joe.me",
+}},
+Name: "joe",
+Note: "this person is very important",
+Phones: []contact.Phone{
+contact.Phone{
+		Label: "home",
+		Number: "010-12345678",
+}},
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/crypto/README.md b/examples/crypto/README.md
index 6434fc3..4f0aca0 100755
--- a/examples/crypto/README.md
+++ b/examples/crypto/README.md
@@ -4,62 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/crypto/api](ht
 
 Endpoints:
 
-## Quote
-
-Get the last quote for a given crypto ticker
-
-
-[https://m3o.com/crypto/api#Quote](https://m3o.com/crypto/api#Quote)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/crypto"
-)
-
-// Get the last quote for a given crypto ticker
-func GetAcryptocurrencyQuote() {
-	cryptoService := crypto.NewCryptoService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := cryptoService.Quote(&crypto.QuoteRequest{
-		Symbol: "BTCUSD",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## History
-
-Returns the history for the previous close
-
-
-[https://m3o.com/crypto/api#History](https://m3o.com/crypto/api#History)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/crypto"
-)
-
-// Returns the history for the previous close
-func GetPreviousClose() {
-	cryptoService := crypto.NewCryptoService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := cryptoService.History(&crypto.HistoryRequest{
-		Symbol: "BTCUSD",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## News
 
 Get news related to a currency
@@ -116,3 +60,59 @@ func GetCryptocurrencyPrice() {
 	
 }
 ```
+## Quote
+
+Get the last quote for a given crypto ticker
+
+
+[https://m3o.com/crypto/api#Quote](https://m3o.com/crypto/api#Quote)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/crypto"
+)
+
+// Get the last quote for a given crypto ticker
+func GetAcryptocurrencyQuote() {
+	cryptoService := crypto.NewCryptoService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := cryptoService.Quote(&crypto.QuoteRequest{
+		Symbol: "BTCUSD",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## History
+
+Returns the history for the previous close
+
+
+[https://m3o.com/crypto/api#History](https://m3o.com/crypto/api#History)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/crypto"
+)
+
+// Returns the history for the previous close
+func GetPreviousClose() {
+	cryptoService := crypto.NewCryptoService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := cryptoService.History(&crypto.HistoryRequest{
+		Symbol: "BTCUSD",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/currency/README.md b/examples/currency/README.md
index f788d89..208ce2d 100755
--- a/examples/currency/README.md
+++ b/examples/currency/README.md
@@ -4,34 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/currency/api](
 
 Endpoints:
 
-## Rates
-
-Rates returns the currency rates for a given code e.g USD
-
-
-[https://m3o.com/currency/api#Rates](https://m3o.com/currency/api#Rates)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/currency"
-)
-
-// Rates returns the currency rates for a given code e.g USD
-func GetRatesForUsd() {
-	currencyService := currency.NewCurrencyService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := currencyService.Rates(&currency.RatesRequest{
-		Code: "USD",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Convert
 
 Convert returns the currency conversion rate between two pairs e.g USD/GBP
@@ -147,3 +119,31 @@ func GetSupportedCodes() {
 	
 }
 ```
+## Rates
+
+Rates returns the currency rates for a given code e.g USD
+
+
+[https://m3o.com/currency/api#Rates](https://m3o.com/currency/api#Rates)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/currency"
+)
+
+// Rates returns the currency rates for a given code e.g USD
+func GetRatesForUsd() {
+	currencyService := currency.NewCurrencyService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := currencyService.Rates(&currency.RatesRequest{
+		Code: "USD",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/db/README.md b/examples/db/README.md
index 2507a7e..06504dd 100755
--- a/examples/db/README.md
+++ b/examples/db/README.md
@@ -4,6 +4,101 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/db/api](https:
 
 Endpoints:
 
+## Create
+
+Create a record in the database. Optionally include an "id" field otherwise it's set automatically.
+
+
+[https://m3o.com/db/api#Create](https://m3o.com/db/api#Create)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/db"
+)
+
+// Create a record in the database. Optionally include an "id" field otherwise it's set automatically.
+func CreateArecord() {
+	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := dbService.Create(&db.CreateRequest{
+		Record: map[string]interface{}{
+	"id": "1",
+	"name": "Jane",
+	"age": 42,
+	"isActive": true,
+},
+Table: "example",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Update
+
+Update a record in the database. Include an "id" in the record to update.
+
+
+[https://m3o.com/db/api#Update](https://m3o.com/db/api#Update)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/db"
+)
+
+// Update a record in the database. Include an "id" in the record to update.
+func UpdateArecord() {
+	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := dbService.Update(&db.UpdateRequest{
+		Record: map[string]interface{}{
+	"id": "1",
+	"age": 43,
+},
+Table: "example",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Read
+
+Read data from a table. Lookup can be by ID or via querying any field in the record.
+
+
+[https://m3o.com/db/api#Read](https://m3o.com/db/api#Read)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/db"
+)
+
+// Read data from a table. Lookup can be by ID or via querying any field in the record.
+func ReadRecords() {
+	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := dbService.Read(&db.ReadRequest{
+		Query: "age == 43",
+Table: "example",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Delete
 
 Delete a record in the database by id.
@@ -31,6 +126,34 @@ Table: "example",
 	})
 	fmt.Println(rsp, err)
 	
+}
+```
+## Truncate
+
+Truncate the records in a table
+
+
+[https://m3o.com/db/api#Truncate](https://m3o.com/db/api#Truncate)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/db"
+)
+
+// Truncate the records in a table
+func TruncateTable() {
+	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := dbService.Truncate(&db.TruncateRequest{
+		Table: "example",
+
+	})
+	fmt.Println(rsp, err)
+	
 }
 ```
 ## DropTable
@@ -114,97 +237,6 @@ func ListTables() {
 	})
 	fmt.Println(rsp, err)
 	
-}
-```
-## Create
-
-Create a record in the database. Optionally include an "id" field otherwise it's set automatically.
-
-
-[https://m3o.com/db/api#Create](https://m3o.com/db/api#Create)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/db"
-)
-
-// Create a record in the database. Optionally include an "id" field otherwise it's set automatically.
-func CreateArecord() {
-	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := dbService.Create(&db.CreateRequest{
-		Record: map[string]interface{}{
-	"id": "1",
-	"name": "Jane",
-	"age": 42,
-	"isActive": true,
-},
-Table: "example",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Read
-
-Read data from a table. Lookup can be by ID or via querying any field in the record.
-
-
-[https://m3o.com/db/api#Read](https://m3o.com/db/api#Read)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/db"
-)
-
-// Read data from a table. Lookup can be by ID or via querying any field in the record.
-func ReadRecords() {
-	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := dbService.Read(&db.ReadRequest{
-		Query: "age == 43",
-Table: "example",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Truncate
-
-Truncate the records in a table
-
-
-[https://m3o.com/db/api#Truncate](https://m3o.com/db/api#Truncate)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/db"
-)
-
-// Truncate the records in a table
-func TruncateTable() {
-	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := dbService.Truncate(&db.TruncateRequest{
-		Table: "example",
-
-	})
-	fmt.Println(rsp, err)
-	
 }
 ```
 ## RenameTable
@@ -236,35 +268,3 @@ To: "examples3",
 	
 }
 ```
-## Update
-
-Update a record in the database. Include an "id" in the record to update.
-
-
-[https://m3o.com/db/api#Update](https://m3o.com/db/api#Update)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/db"
-)
-
-// Update a record in the database. Include an "id" in the record to update.
-func UpdateArecord() {
-	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := dbService.Update(&db.UpdateRequest{
-		Record: map[string]interface{}{
-	"id": "1",
-	"age": 43,
-},
-Table: "example",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/db/update/updateARecord/main.go b/examples/db/update/updateARecord/main.go
index f14eea3..79984e8 100755
--- a/examples/db/update/updateARecord/main.go
+++ b/examples/db/update/updateARecord/main.go
@@ -12,8 +12,8 @@ func main() {
 	dbService := db.NewDbService(os.Getenv("M3O_API_TOKEN"))
 	rsp, err := dbService.Update(&db.UpdateRequest{
 		Record: map[string]interface{}{
-			"id":  "1",
 			"age": 43,
+			"id":  "1",
 		},
 		Table: "example",
 	})
diff --git a/examples/email/README.md b/examples/email/README.md
index 8e6afcf..b04ca45 100755
--- a/examples/email/README.md
+++ b/examples/email/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/email/api](htt
 
 Endpoints:
 
+## Validate
+
+Validate an email address format
+
+
+[https://m3o.com/email/api#Validate](https://m3o.com/email/api#Validate)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/email"
+)
+
+// Validate an email address format
+func ValidateEmail() {
+	emailService := email.NewEmailService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := emailService.Validate(&email.ValidateRequest{
+		Address: "joe@example.com",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Send
 
 Send an email by passing in from, to, subject, and a text or html body
@@ -64,31 +92,3 @@ func ParseEmail() {
 	
 }
 ```
-## Validate
-
-Validate an email address format
-
-
-[https://m3o.com/email/api#Validate](https://m3o.com/email/api#Validate)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/email"
-)
-
-// Validate an email address format
-func ValidateEmail() {
-	emailService := email.NewEmailService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := emailService.Validate(&email.ValidateRequest{
-		Address: "joe@example.com",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/emoji/README.md b/examples/emoji/README.md
index ea3d204..ea3a4ee 100755
--- a/examples/emoji/README.md
+++ b/examples/emoji/README.md
@@ -4,36 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/emoji/api](htt
 
 Endpoints:
 
-## Send
-
-Send an emoji to anyone via SMS. Messages are sent in the form '<message> Sent from <from>'
-
-
-[https://m3o.com/emoji/api#Send](https://m3o.com/emoji/api#Send)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/emoji"
-)
-
-// Send an emoji to anyone via SMS. Messages are sent in the form '<message> Sent from <from>'
-func SendAtextContainingAnEmojiToAnyoneViaSms() {
-	emojiService := emoji.NewEmojiService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := emojiService.Send(&emoji.SendRequest{
-		From: "Alice",
-Message: "let's grab a :beer:",
-To: "+44782669123",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Find
 
 Find an emoji by its alias e.g :beer:
@@ -119,3 +89,33 @@ func PrintTextIncludingEmoji() {
 	
 }
 ```
+## Send
+
+Send an emoji to anyone via SMS. Messages are sent in the form '<message> Sent from <from>'
+
+
+[https://m3o.com/emoji/api#Send](https://m3o.com/emoji/api#Send)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/emoji"
+)
+
+// Send an emoji to anyone via SMS. Messages are sent in the form '<message> Sent from <from>'
+func SendAtextContainingAnEmojiToAnyoneViaSms() {
+	emojiService := emoji.NewEmojiService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := emojiService.Send(&emoji.SendRequest{
+		From: "Alice",
+Message: "let's grab a :beer:",
+To: "+44782669123",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/event/publish/publishAnEvent/main.go b/examples/event/publish/publishAnEvent/main.go
index 287af64..eb4cfd3 100755
--- a/examples/event/publish/publishAnEvent/main.go
+++ b/examples/event/publish/publishAnEvent/main.go
@@ -12,9 +12,9 @@ func main() {
 	eventService := event.NewEventService(os.Getenv("M3O_API_TOKEN"))
 	rsp, err := eventService.Publish(&event.PublishRequest{
 		Message: map[string]interface{}{
+			"user": "john",
 			"id":   "1",
 			"type": "signup",
-			"user": "john",
 		},
 		Topic: "user",
 	})
diff --git a/examples/forex/README.md b/examples/forex/README.md
index 56698bb..a91003f 100755
--- a/examples/forex/README.md
+++ b/examples/forex/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/forex/api](htt
 
 Endpoints:
 
+## Price
+
+Get the latest price for a given forex ticker
+
+
+[https://m3o.com/forex/api#Price](https://m3o.com/forex/api#Price)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/forex"
+)
+
+// Get the latest price for a given forex ticker
+func GetAnFxPrice() {
+	forexService := forex.NewForexService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := forexService.Price(&forex.PriceRequest{
+		Symbol: "GBPUSD",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Quote
 
 Get the latest quote for the forex
@@ -60,31 +88,3 @@ func GetPreviousClose() {
 	
 }
 ```
-## Price
-
-Get the latest price for a given forex ticker
-
-
-[https://m3o.com/forex/api#Price](https://m3o.com/forex/api#Price)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/forex"
-)
-
-// Get the latest price for a given forex ticker
-func GetAnFxPrice() {
-	forexService := forex.NewForexService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := forexService.Price(&forex.PriceRequest{
-		Symbol: "GBPUSD",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/function/README.md b/examples/function/README.md
index 1a5ea51..a9441fc 100755
--- a/examples/function/README.md
+++ b/examples/function/README.md
@@ -36,116 +36,6 @@ Subfolder: "examples/go-function",
 	})
 	fmt.Println(rsp, err)
 	
-}
-```
-## List
-
-List all the deployed functions
-
-
-[https://m3o.com/function/api#List](https://m3o.com/function/api#List)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/function"
-)
-
-// List all the deployed functions
-func ListFunctions() {
-	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := functionService.List(&function.ListRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Regions
-
-Return a list of supported regions
-
-
-[https://m3o.com/function/api#Regions](https://m3o.com/function/api#Regions)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/function"
-)
-
-// Return a list of supported regions
-func ListRegions() {
-	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := functionService.Regions(&function.RegionsRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Reserve
-
-Reserve function names and resources beyond free quota
-
-
-[https://m3o.com/function/api#Reserve](https://m3o.com/function/api#Reserve)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/function"
-)
-
-// Reserve function names and resources beyond free quota
-func ReserveAfunction() {
-	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := functionService.Reserve(&function.ReserveRequest{
-		Name: "helloworld",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Update
-
-Update a function. Downloads the source, builds and redeploys
-
-
-[https://m3o.com/function/api#Update](https://m3o.com/function/api#Update)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/function"
-)
-
-// Update a function. Downloads the source, builds and redeploys
-func UpdateAfunction() {
-	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := functionService.Update(&function.UpdateRequest{
-		Name: "helloworld",
-
-	})
-	fmt.Println(rsp, err)
-	
 }
 ```
 ## Call
@@ -233,6 +123,34 @@ func DescribeFunctionStatus() {
 	})
 	fmt.Println(rsp, err)
 	
+}
+```
+## Reserve
+
+Reserve function names and resources beyond free quota
+
+
+[https://m3o.com/function/api#Reserve](https://m3o.com/function/api#Reserve)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/function"
+)
+
+// Reserve function names and resources beyond free quota
+func ReserveAfunction() {
+	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := functionService.Reserve(&function.ReserveRequest{
+		Name: "helloworld",
+
+	})
+	fmt.Println(rsp, err)
+	
 }
 ```
 ## Proxy
@@ -263,3 +181,85 @@ func ProxyUrl() {
 	
 }
 ```
+## Update
+
+Update a function. Downloads the source, builds and redeploys
+
+
+[https://m3o.com/function/api#Update](https://m3o.com/function/api#Update)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/function"
+)
+
+// Update a function. Downloads the source, builds and redeploys
+func UpdateAfunction() {
+	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := functionService.Update(&function.UpdateRequest{
+		Name: "helloworld",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## List
+
+List all the deployed functions
+
+
+[https://m3o.com/function/api#List](https://m3o.com/function/api#List)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/function"
+)
+
+// List all the deployed functions
+func ListFunctions() {
+	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := functionService.List(&function.ListRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Regions
+
+Return a list of supported regions
+
+
+[https://m3o.com/function/api#Regions](https://m3o.com/function/api#Regions)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/function"
+)
+
+// Return a list of supported regions
+func ListRegions() {
+	functionService := function.NewFunctionService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := functionService.Regions(&function.RegionsRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/holidays/README.md b/examples/holidays/README.md
index ee48873..786de28 100755
--- a/examples/holidays/README.md
+++ b/examples/holidays/README.md
@@ -4,6 +4,33 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/holidays/api](
 
 Endpoints:
 
+## Countries
+
+Get the list of countries that are supported by this API
+
+
+[https://m3o.com/holidays/api#Countries](https://m3o.com/holidays/api#Countries)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/holidays"
+)
+
+// Get the list of countries that are supported by this API
+func ListCountries() {
+	holidaysService := holidays.NewHolidaysService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := holidaysService.Countries(&holidays.CountriesRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## List
 
 List the holiday dates for a given country and year
@@ -32,30 +59,3 @@ func GetHolidays() {
 	
 }
 ```
-## Countries
-
-Get the list of countries that are supported by this API
-
-
-[https://m3o.com/holidays/api#Countries](https://m3o.com/holidays/api#Countries)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/holidays"
-)
-
-// Get the list of countries that are supported by this API
-func ListCountries() {
-	holidaysService := holidays.NewHolidaysService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := holidaysService.Countries(&holidays.CountriesRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/id/README.md b/examples/id/README.md
index 8013667..eb26228 100755
--- a/examples/id/README.md
+++ b/examples/id/README.md
@@ -4,33 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/id/api](https:
 
 Endpoints:
 
-## Types
-
-List the types of IDs available. No query params needed.
-
-
-[https://m3o.com/id/api#Types](https://m3o.com/id/api#Types)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/id"
-)
-
-// List the types of IDs available. No query params needed.
-func ListTheTypesOfIdsAvailable() {
-	idService := id.NewIdService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := idService.Types(&id.TypesRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Generate
 
 Generate a unique ID. Defaults to uuid.
@@ -143,3 +116,30 @@ func GenerateAbigflakeId() {
 	
 }
 ```
+## Types
+
+List the types of IDs available. No query params needed.
+
+
+[https://m3o.com/id/api#Types](https://m3o.com/id/api#Types)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/id"
+)
+
+// List the types of IDs available. No query params needed.
+func ListTheTypesOfIdsAvailable() {
+	idService := id.NewIdService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := idService.Types(&id.TypesRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/mq/README.md b/examples/mq/README.md
index 8f18a93..1fc9922 100755
--- a/examples/mq/README.md
+++ b/examples/mq/README.md
@@ -26,9 +26,9 @@ func PublishAmessage() {
 	mqService := mq.NewMqService(os.Getenv("M3O_API_TOKEN"))
 	rsp, err := mqService.Publish(&mq.PublishRequest{
 		Message: map[string]interface{}{
+	"type": "signup",
 	"user": "john",
 	"id": "1",
-	"type": "signup",
 },
 Topic: "events",
 
diff --git a/examples/mq/publish/publishAMessage/main.go b/examples/mq/publish/publishAMessage/main.go
index fe21c56..e6a7451 100755
--- a/examples/mq/publish/publishAMessage/main.go
+++ b/examples/mq/publish/publishAMessage/main.go
@@ -12,9 +12,9 @@ func main() {
 	mqService := mq.NewMqService(os.Getenv("M3O_API_TOKEN"))
 	rsp, err := mqService.Publish(&mq.PublishRequest{
 		Message: map[string]interface{}{
+			"type": "signup",
 			"user": "john",
 			"id":   "1",
-			"type": "signup",
 		},
 		Topic: "events",
 	})
diff --git a/examples/nft/README.md b/examples/nft/README.md
index d3bafa7..fd01a20 100755
--- a/examples/nft/README.md
+++ b/examples/nft/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/nft/api](https
 
 Endpoints:
 
+## Collections
+
+Get a list of collections
+
+
+[https://m3o.com/nft/api#Collections](https://m3o.com/nft/api#Collections)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/nft"
+)
+
+// Get a list of collections
+func ListCollections() {
+	nftService := nft.NewNftService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := nftService.Collections(&nft.CollectionsRequest{
+		Limit: 1,
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Assets
 
 Return a list of assets
@@ -61,31 +89,3 @@ Name: "Guybrush Threepwood",
 	
 }
 ```
-## Collections
-
-Get a list of collections
-
-
-[https://m3o.com/nft/api#Collections](https://m3o.com/nft/api#Collections)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/nft"
-)
-
-// Get a list of collections
-func ListCollections() {
-	nftService := nft.NewNftService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := nftService.Collections(&nft.CollectionsRequest{
-		Limit: 1,
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/notes/README.md b/examples/notes/README.md
index 3bc665d..9e98ae9 100755
--- a/examples/notes/README.md
+++ b/examples/notes/README.md
@@ -4,6 +4,90 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/notes/api](htt
 
 Endpoints:
 
+## Create
+
+Create a new note
+
+
+[https://m3o.com/notes/api#Create](https://m3o.com/notes/api#Create)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/notes"
+)
+
+// Create a new note
+func CreateAnote() {
+	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := notesService.Create(&notes.CreateRequest{
+		Text: "This is my note",
+Title: "New Note",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Read
+
+Read a note
+
+
+[https://m3o.com/notes/api#Read](https://m3o.com/notes/api#Read)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/notes"
+)
+
+// Read a note
+func ReadAnote() {
+	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := notesService.Read(&notes.ReadRequest{
+		Id: "63c0cdf8-2121-11ec-a881-0242e36f037a",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## List
+
+List all the notes
+
+
+[https://m3o.com/notes/api#List](https://m3o.com/notes/api#List)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/notes"
+)
+
+// List all the notes
+func ListAllNotes() {
+	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := notesService.List(&notes.ListRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Update
 
 Update a note
@@ -105,87 +189,3 @@ func SubscribeToEvents() {
 	}
 }
 ```
-## Create
-
-Create a new note
-
-
-[https://m3o.com/notes/api#Create](https://m3o.com/notes/api#Create)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/notes"
-)
-
-// Create a new note
-func CreateAnote() {
-	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := notesService.Create(&notes.CreateRequest{
-		Text: "This is my note",
-Title: "New Note",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Read
-
-Read a note
-
-
-[https://m3o.com/notes/api#Read](https://m3o.com/notes/api#Read)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/notes"
-)
-
-// Read a note
-func ReadAnote() {
-	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := notesService.Read(&notes.ReadRequest{
-		Id: "63c0cdf8-2121-11ec-a881-0242e36f037a",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## List
-
-List all the notes
-
-
-[https://m3o.com/notes/api#List](https://m3o.com/notes/api#List)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/notes"
-)
-
-// List all the notes
-func ListAllNotes() {
-	notesService := notes.NewNotesService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := notesService.List(&notes.ListRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/otp/README.md b/examples/otp/README.md
index 421d43d..c585537 100755
--- a/examples/otp/README.md
+++ b/examples/otp/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/otp/api](https
 
 Endpoints:
 
+## Generate
+
+Generate an OTP (one time pass) code
+
+
+[https://m3o.com/otp/api#Generate](https://m3o.com/otp/api#Generate)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/otp"
+)
+
+// Generate an OTP (one time pass) code
+func GenerateOtp() {
+	otpService := otp.NewOtpService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := otpService.Generate(&otp.GenerateRequest{
+		Id: "asim@example.com",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Validate
 
 Validate the OTP code
@@ -33,31 +61,3 @@ Id: "asim@example.com",
 	
 }
 ```
-## Generate
-
-Generate an OTP (one time pass) code
-
-
-[https://m3o.com/otp/api#Generate](https://m3o.com/otp/api#Generate)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/otp"
-)
-
-// Generate an OTP (one time pass) code
-func GenerateOtp() {
-	otpService := otp.NewOtpService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := otpService.Generate(&otp.GenerateRequest{
-		Id: "asim@example.com",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/postcode/README.md b/examples/postcode/README.md
index a29eef3..a497f9c 100755
--- a/examples/postcode/README.md
+++ b/examples/postcode/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/postcode/api](
 
 Endpoints:
 
+## Lookup
+
+Lookup a postcode to retrieve the related region, county, etc
+
+
+[https://m3o.com/postcode/api#Lookup](https://m3o.com/postcode/api#Lookup)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/postcode"
+)
+
+// Lookup a postcode to retrieve the related region, county, etc
+func LookupPostcode() {
+	postcodeService := postcode.NewPostcodeService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := postcodeService.Lookup(&postcode.LookupRequest{
+		Postcode: "SW1A 2AA",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Random
 
 Return a random postcode and its related info
@@ -59,31 +87,3 @@ func ReturnArandomPostcodeAndItsInformation() {
 	
 }
 ```
-## Lookup
-
-Lookup a postcode to retrieve the related region, county, etc
-
-
-[https://m3o.com/postcode/api#Lookup](https://m3o.com/postcode/api#Lookup)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/postcode"
-)
-
-// Lookup a postcode to retrieve the related region, county, etc
-func LookupPostcode() {
-	postcodeService := postcode.NewPostcodeService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := postcodeService.Lookup(&postcode.LookupRequest{
-		Postcode: "SW1A 2AA",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/quran/README.md b/examples/quran/README.md
index ec04685..5ce6584 100755
--- a/examples/quran/README.md
+++ b/examples/quran/README.md
@@ -4,6 +4,34 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/quran/api](htt
 
 Endpoints:
 
+## Summary
+
+Get a summary for a given chapter (surah)
+
+
+[https://m3o.com/quran/api#Summary](https://m3o.com/quran/api#Summary)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/quran"
+)
+
+// Get a summary for a given chapter (surah)
+func GetChapterSummary() {
+	quranService := quran.NewQuranService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := quranService.Summary(&quran.SummaryRequest{
+		Chapter: 1,
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Verses
 
 Lookup the verses (ayahs) for a chapter including
@@ -92,31 +120,3 @@ func ListChapters() {
 	
 }
 ```
-## Summary
-
-Get a summary for a given chapter (surah)
-
-
-[https://m3o.com/quran/api#Summary](https://m3o.com/quran/api#Summary)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/quran"
-)
-
-// Get a summary for a given chapter (surah)
-func GetChapterSummary() {
-	quranService := quran.NewQuranService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := quranService.Summary(&quran.SummaryRequest{
-		Chapter: 1,
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/routing/README.md b/examples/routing/README.md
index f133a39..b66e7d8 100755
--- a/examples/routing/README.md
+++ b/examples/routing/README.md
@@ -4,41 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/routing/api](h
 
 Endpoints:
 
-## Eta
-
-Get the eta for a route from origin to destination. The eta is an estimated time based on car routes
-
-
-[https://m3o.com/routing/api#Eta](https://m3o.com/routing/api#Eta)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/routing"
-)
-
-// Get the eta for a route from origin to destination. The eta is an estimated time based on car routes
-func EtaFromPointAtoPointB() {
-	routingService := routing.NewRoutingService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := routingService.Eta(&routing.EtaRequest{
-		Destination: &routing.Point{
-	Latitude: 52.529407,
-	Longitude: 13.397634,
-},
-Origin: &routing.Point{
-	Latitude: 52.517037,
-	Longitude: 13.38886,
-},
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## Directions
 
 Turn by turn directions from a start point to an end point including maneuvers and bearings
@@ -109,3 +74,38 @@ Origin: &routing.Point{
 	
 }
 ```
+## Eta
+
+Get the eta for a route from origin to destination. The eta is an estimated time based on car routes
+
+
+[https://m3o.com/routing/api#Eta](https://m3o.com/routing/api#Eta)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/routing"
+)
+
+// Get the eta for a route from origin to destination. The eta is an estimated time based on car routes
+func EtaFromPointAtoPointB() {
+	routingService := routing.NewRoutingService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := routingService.Eta(&routing.EtaRequest{
+		Destination: &routing.Point{
+	Latitude: 52.529407,
+	Longitude: 13.397634,
+},
+Origin: &routing.Point{
+	Latitude: 52.517037,
+	Longitude: 13.38886,
+},
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/search/README.md b/examples/search/README.md
index c634e6a..99af5ee 100755
--- a/examples/search/README.md
+++ b/examples/search/README.md
@@ -4,6 +4,91 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/search/api](ht
 
 Endpoints:
 
+## Delete
+
+Delete a document given its ID
+
+
+[https://m3o.com/search/api#Delete](https://m3o.com/search/api#Delete)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/search"
+)
+
+// Delete a document given its ID
+func DeleteAdocument() {
+	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := searchService.Delete(&search.DeleteRequest{
+		Id: "1234",
+Index: "customers",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## CreateIndex
+
+Create an index by name
+
+
+[https://m3o.com/search/api#CreateIndex](https://m3o.com/search/api#CreateIndex)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/search"
+)
+
+// Create an index by name
+func CreateAnIndex() {
+	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := searchService.CreateIndex(&search.CreateIndexRequest{
+		Index: "customers",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## DeleteIndex
+
+Delete an index by name
+
+
+[https://m3o.com/search/api#DeleteIndex](https://m3o.com/search/api#DeleteIndex)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/search"
+)
+
+// Delete an index by name
+func DeleteAnIndex() {
+	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := searchService.DeleteIndex(&search.DeleteIndexRequest{
+		Index: "customers",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Index
 
 Index a document i.e. insert a document to search for.
@@ -27,9 +112,9 @@ func IndexAdocument() {
 	rsp, err := searchService.Index(&search.IndexRequest{
 		Document: &search.Document{
 	Contents: map[string]interface{}{
-		"starsign": "Leo",
 		"name": "John Doe",
 		"age": 37,
+		"starsign": "Leo",
 },
 	Id: "1234",
 },
@@ -127,88 +212,3 @@ Query: "name == 'John' OR name == 'Jane'",
 	
 }
 ```
-## Delete
-
-Delete a document given its ID
-
-
-[https://m3o.com/search/api#Delete](https://m3o.com/search/api#Delete)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/search"
-)
-
-// Delete a document given its ID
-func DeleteAdocument() {
-	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := searchService.Delete(&search.DeleteRequest{
-		Id: "1234",
-Index: "customers",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## CreateIndex
-
-Create an index by name
-
-
-[https://m3o.com/search/api#CreateIndex](https://m3o.com/search/api#CreateIndex)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/search"
-)
-
-// Create an index by name
-func CreateAnIndex() {
-	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := searchService.CreateIndex(&search.CreateIndexRequest{
-		Index: "customers",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## DeleteIndex
-
-Delete an index by name
-
-
-[https://m3o.com/search/api#DeleteIndex](https://m3o.com/search/api#DeleteIndex)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/search"
-)
-
-// Delete an index by name
-func DeleteAnIndex() {
-	searchService := search.NewSearchService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := searchService.DeleteIndex(&search.DeleteIndexRequest{
-		Index: "customers",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/space/README.md b/examples/space/README.md
index caa0bf5..e0dac00 100755
--- a/examples/space/README.md
+++ b/examples/space/README.md
@@ -4,6 +4,62 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/space/api](htt
 
 Endpoints:
 
+## Read
+
+Read an object in space
+
+
+[https://m3o.com/space/api#Read](https://m3o.com/space/api#Read)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/space"
+)
+
+// Read an object in space
+func ReadAnObject() {
+	spaceService := space.NewSpaceService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := spaceService.Read(&space.ReadRequest{
+		Name: "images/file.jpg",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Download
+
+Download an object via a presigned url
+
+
+[https://m3o.com/space/api#Download](https://m3o.com/space/api#Download)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/space"
+)
+
+// Download an object via a presigned url
+func DownloadAnObject() {
+	spaceService := space.NewSpaceService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := spaceService.Download(&space.DownloadRequest{
+		Name: "images/file.jpg",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Upload
 
 Upload a large object (> 10MB). Returns a time limited presigned URL to be used for uploading the object
@@ -176,59 +232,3 @@ func HeadAnObject() {
 	
 }
 ```
-## Read
-
-Read an object in space
-
-
-[https://m3o.com/space/api#Read](https://m3o.com/space/api#Read)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/space"
-)
-
-// Read an object in space
-func ReadAnObject() {
-	spaceService := space.NewSpaceService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := spaceService.Read(&space.ReadRequest{
-		Name: "images/file.jpg",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Download
-
-Download an object via a presigned url
-
-
-[https://m3o.com/space/api#Download](https://m3o.com/space/api#Download)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/space"
-)
-
-// Download an object via a presigned url
-func DownloadAnObject() {
-	spaceService := space.NewSpaceService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := spaceService.Download(&space.DownloadRequest{
-		Name: "images/file.jpg",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/stock/README.md b/examples/stock/README.md
index 0d497b8..2018b54 100755
--- a/examples/stock/README.md
+++ b/examples/stock/README.md
@@ -4,6 +4,38 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/stock/api](htt
 
 Endpoints:
 
+## OrderBook
+
+Get the historic order book and each trade by timestamp
+
+
+[https://m3o.com/stock/api#OrderBook](https://m3o.com/stock/api#OrderBook)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/stock"
+)
+
+// Get the historic order book and each trade by timestamp
+func OrderBookHistory() {
+	stockService := stock.NewStockService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := stockService.OrderBook(&stock.OrderBookRequest{
+		Date: "2020-10-01",
+End: "2020-10-01T11:00:00Z",
+Limit: 3,
+Start: "2020-10-01T10:00:00Z",
+Stock: "AAPL",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Price
 
 Get the last price for a given stock ticker
@@ -89,35 +121,3 @@ Stock: "AAPL",
 	
 }
 ```
-## OrderBook
-
-Get the historic order book and each trade by timestamp
-
-
-[https://m3o.com/stock/api#OrderBook](https://m3o.com/stock/api#OrderBook)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/stock"
-)
-
-// Get the historic order book and each trade by timestamp
-func OrderBookHistory() {
-	stockService := stock.NewStockService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := stockService.OrderBook(&stock.OrderBookRequest{
-		Date: "2020-10-01",
-End: "2020-10-01T11:00:00Z",
-Limit: 3,
-Start: "2020-10-01T10:00:00Z",
-Stock: "AAPL",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/stream/README.md b/examples/stream/README.md
index 11fa9f3..232026e 100755
--- a/examples/stream/README.md
+++ b/examples/stream/README.md
@@ -4,6 +4,37 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/stream/api](ht
 
 Endpoints:
 
+## CreateChannel
+
+Create a channel with a given name and description. Channels are created automatically but
+this allows you to specify a description that's persisted for the lifetime of the channel.
+
+
+[https://m3o.com/stream/api#CreateChannel](https://m3o.com/stream/api#CreateChannel)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/stream"
+)
+
+// Create a channel with a given name and description. Channels are created automatically but
+// this allows you to specify a description that's persisted for the lifetime of the channel.
+func CreateChannel() {
+	streamService := stream.NewStreamService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := streamService.CreateChannel(&stream.CreateChannelRequest{
+		Description: "The channel for all things",
+Name: "general",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## SendMessage
 
 Send a message to the stream.
@@ -88,34 +119,3 @@ func ListChannels() {
 	
 }
 ```
-## CreateChannel
-
-Create a channel with a given name and description. Channels are created automatically but
-this allows you to specify a description that's persisted for the lifetime of the channel.
-
-
-[https://m3o.com/stream/api#CreateChannel](https://m3o.com/stream/api#CreateChannel)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/stream"
-)
-
-// Create a channel with a given name and description. Channels are created automatically but
-// this allows you to specify a description that's persisted for the lifetime of the channel.
-func CreateChannel() {
-	streamService := stream.NewStreamService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := streamService.CreateChannel(&stream.CreateChannelRequest{
-		Description: "The channel for all things",
-Name: "general",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/sunnah/README.md b/examples/sunnah/README.md
index 6036ae5..68ccae1 100755
--- a/examples/sunnah/README.md
+++ b/examples/sunnah/README.md
@@ -4,6 +4,36 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/sunnah/api](ht
 
 Endpoints:
 
+## Books
+
+Get a list of books from within a collection. A book can contain many chapters
+each with its own hadiths.
+
+
+[https://m3o.com/sunnah/api#Books](https://m3o.com/sunnah/api#Books)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/sunnah"
+)
+
+// Get a list of books from within a collection. A book can contain many chapters
+// each with its own hadiths.
+func GetTheBooksWithinAcollection() {
+	sunnahService := sunnah.NewSunnahService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := sunnahService.Books(&sunnah.BooksRequest{
+		Collection: "bukhari",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
 ## Chapters
 
 Get all the chapters of a given book within a collection.
@@ -93,33 +123,3 @@ func ListAvailableCollections() {
 	
 }
 ```
-## Books
-
-Get a list of books from within a collection. A book can contain many chapters
-each with its own hadiths.
-
-
-[https://m3o.com/sunnah/api#Books](https://m3o.com/sunnah/api#Books)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/sunnah"
-)
-
-// Get a list of books from within a collection. A book can contain many chapters
-// each with its own hadiths.
-func GetTheBooksWithinAcollection() {
-	sunnahService := sunnah.NewSunnahService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := sunnahService.Books(&sunnah.BooksRequest{
-		Collection: "bukhari",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
diff --git a/examples/twitter/README.md b/examples/twitter/README.md
index 19128ad..ec1dada 100755
--- a/examples/twitter/README.md
+++ b/examples/twitter/README.md
@@ -4,61 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/twitter/api](h
 
 Endpoints:
 
-## Search
-
-Search for tweets with a simple query
-
-
-[https://m3o.com/twitter/api#Search](https://m3o.com/twitter/api#Search)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/twitter"
-)
-
-// Search for tweets with a simple query
-func SearchForTweets() {
-	twitterService := twitter.NewTwitterService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := twitterService.Search(&twitter.SearchRequest{
-		Query: "cats",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Trends
-
-Get the current global trending topics
-
-
-[https://m3o.com/twitter/api#Trends](https://m3o.com/twitter/api#Trends)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/twitter"
-)
-
-// Get the current global trending topics
-func GetTheCurrentGlobalTrendingTopics() {
-	twitterService := twitter.NewTwitterService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := twitterService.Trends(&twitter.TrendsRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## User
 
 Get a user's twitter profile
@@ -116,3 +61,58 @@ Username: "m3oservices",
 	
 }
 ```
+## Search
+
+Search for tweets with a simple query
+
+
+[https://m3o.com/twitter/api#Search](https://m3o.com/twitter/api#Search)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/twitter"
+)
+
+// Search for tweets with a simple query
+func SearchForTweets() {
+	twitterService := twitter.NewTwitterService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := twitterService.Search(&twitter.SearchRequest{
+		Query: "cats",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## Trends
+
+Get the current global trending topics
+
+
+[https://m3o.com/twitter/api#Trends](https://m3o.com/twitter/api#Trends)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/twitter"
+)
+
+// Get the current global trending topics
+func GetTheCurrentGlobalTrendingTopics() {
+	twitterService := twitter.NewTwitterService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := twitterService.Trends(&twitter.TrendsRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/url/README.md b/examples/url/README.md
index 551bd38..ec670c0 100755
--- a/examples/url/README.md
+++ b/examples/url/README.md
@@ -4,33 +4,6 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/url/api](https
 
 Endpoints:
 
-## Proxy
-
-Proxy returns the destination URL of a short URL.
-
-
-[https://m3o.com/url/api#Proxy](https://m3o.com/url/api#Proxy)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/url"
-)
-
-// Proxy returns the destination URL of a short URL.
-func ResolveAshortUrlToAlongDestinationUrl() {
-	urlService := url.NewUrlService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := urlService.Proxy(&url.ProxyRequest{
-		
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
 ## List
 
 List all the shortened URLs
@@ -85,3 +58,30 @@ func ShortenAlongUrl() {
 	
 }
 ```
+## Proxy
+
+Proxy returns the destination URL of a short URL.
+
+
+[https://m3o.com/url/api#Proxy](https://m3o.com/url/api#Proxy)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/url"
+)
+
+// Proxy returns the destination URL of a short URL.
+func ResolveAshortUrlToAlongDestinationUrl() {
+	urlService := url.NewUrlService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := urlService.Proxy(&url.ProxyRequest{
+		
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
diff --git a/examples/user/README.md b/examples/user/README.md
index c20772c..c78574d 100755
--- a/examples/user/README.md
+++ b/examples/user/README.md
@@ -4,18 +4,12 @@ An [m3o.com](https://m3o.com) API. For example usage see [m3o.com/user/api](http
 
 Endpoints:
 
-## SendVerificationEmail
+## Logout
 
-Send a verification email to a user.
-Email "from" will be 'noreply@email.m3ocontent.com'.
-The verification link will be injected in the email
-as a template variable, $micro_verification_link e.g
-'Welcome to M3O! Use the link below to verify your email: $micro_verification_link'
-The variable will be replaced with a url similar to:
-'https://user.m3o.com/user/verify?token=a-verification-token&redirectUrl=your-redir-url'
+Logout a user account
 
 
-[https://m3o.com/user/api#SendVerificationEmail](https://m3o.com/user/api#SendVerificationEmail)
+[https://m3o.com/user/api#Logout](https://m3o.com/user/api#Logout)
 
 ```go
 package example
@@ -27,24 +21,105 @@ import(
 	"go.m3o.com/user"
 )
 
-// Send a verification email to a user.
-// Email "from" will be 'noreply@email.m3ocontent.com'.
-// The verification link will be injected in the email
-// as a template variable, $micro_verification_link e.g
-// 'Welcome to M3O! Use the link below to verify your email: $micro_verification_link'
-// The variable will be replaced with a url similar to:
-// 'https://user.m3o.com/user/verify?token=a-verification-token&redirectUrl=your-redir-url'
-func SendVerificationEmail() {
+// Logout a user account
+func LogAuserOut() {
 	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.SendVerificationEmail(&user.SendVerificationEmailRequest{
-		Email: "joe@example.com",
-FailureRedirectUrl: "https://m3o.com/verification-failed",
-FromName: "Awesome Dot Com",
-RedirectUrl: "https://m3o.com",
-Subject: "Email verification",
-TextContent: `Hi there,
+	rsp, err := userService.Logout(&user.LogoutRequest{
+		SessionId: "df91a612-5b24-4634-99ff-240220ab8f55",
 
-Please verify your email by clicking this link: $micro_verification_link`,
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## List
+
+List all users. Returns a paged list of results
+
+
+[https://m3o.com/user/api#List](https://m3o.com/user/api#List)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/user"
+)
+
+// List all users. Returns a paged list of results
+func ListAllUsers() {
+	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := userService.List(&user.ListRequest{
+		Limit: 100,
+Offset: 0,
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## UpdatePassword
+
+Update the account password
+
+
+[https://m3o.com/user/api#UpdatePassword](https://m3o.com/user/api#UpdatePassword)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/user"
+)
+
+// Update the account password
+func UpdateTheAccountPassword() {
+	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := userService.UpdatePassword(&user.UpdatePasswordRequest{
+		ConfirmPassword: "Password2",
+NewPassword: "Password2",
+OldPassword: "Password1",
+UserId: "user-1",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## SendPasswordResetEmail
+
+Send an email with a verification code to reset password.
+Call "ResetPassword" endpoint once user provides the code.
+
+
+[https://m3o.com/user/api#SendPasswordResetEmail](https://m3o.com/user/api#SendPasswordResetEmail)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/user"
+)
+
+// Send an email with a verification code to reset password.
+// Call "ResetPassword" endpoint once user provides the code.
+func SendPasswordResetEmail() {
+	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := userService.SendPasswordResetEmail(&user.SendPasswordResetEmailRequest{
+		Email: "joe@example.com",
+FromName: "Awesome Dot Com",
+Subject: "Password reset",
+TextContent: `Hi there,
+ click here to reset your password: myapp.com/reset/code?=$code`,
 
 	})
 	fmt.Println(rsp, err)
@@ -82,12 +157,13 @@ NewPassword: "NewPassword1",
 	
 }
 ```
-## List
+## Login
 
-List all users. Returns a paged list of results
+Login using username or email. The response will return a new session for successful login,
+401 in the case of login failure and 500 for any other error
 
 
-[https://m3o.com/user/api#List](https://m3o.com/user/api#List)
+[https://m3o.com/user/api#Login](https://m3o.com/user/api#Login)
 
 ```go
 package example
@@ -99,24 +175,25 @@ import(
 	"go.m3o.com/user"
 )
 
-// List all users. Returns a paged list of results
-func ListAllUsers() {
+// Login using username or email. The response will return a new session for successful login,
+// 401 in the case of login failure and 500 for any other error
+func LogAuserIn() {
 	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.List(&user.ListRequest{
-		Limit: 100,
-Offset: 0,
+	rsp, err := userService.Login(&user.LoginRequest{
+		Email: "joe@example.com",
+Password: "Password1",
 
 	})
 	fmt.Println(rsp, err)
 	
 }
 ```
-## VerifyEmail
+## Create
 
-Verify the email address of an account from a token sent in an email to the user.
+Create a new user account. The email address and username for the account must be unique.
 
 
-[https://m3o.com/user/api#VerifyEmail](https://m3o.com/user/api#VerifyEmail)
+[https://m3o.com/user/api#Create](https://m3o.com/user/api#Create)
 
 ```go
 package example
@@ -128,80 +205,14 @@ import(
 	"go.m3o.com/user"
 )
 
-// Verify the email address of an account from a token sent in an email to the user.
-func VerifyEmail() {
+// Create a new user account. The email address and username for the account must be unique.
+func CreateAnAccount() {
 	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.VerifyEmail(&user.VerifyEmailRequest{
-		Token: "012345",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## VerifyToken
-
-Check whether the token attached to MagicLink is valid or not.
-Ideally, you need to call this endpoint from your http request
-handler that handles the endpoint which is specified in the
-SendMagicLink request.
-
-
-[https://m3o.com/user/api#VerifyToken](https://m3o.com/user/api#VerifyToken)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/user"
-)
-
-// Check whether the token attached to MagicLink is valid or not.
-// Ideally, you need to call this endpoint from your http request
-// handler that handles the endpoint which is specified in the
-// SendMagicLink request.
-func VerifyAtoken() {
-	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.VerifyToken(&user.VerifyTokenRequest{
-		Token: "EdsUiidouJJJLldjlloofUiorkojflsWWdld",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## SendMagicLink
-
-Login using email only - Passwordless
-
-
-[https://m3o.com/user/api#SendMagicLink](https://m3o.com/user/api#SendMagicLink)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/user"
-)
-
-// Login using email only - Passwordless
-func SendAmagicLink() {
-	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.SendMagicLink(&user.SendMagicLinkRequest{
-		Address: "www.example.com",
-Email: "joe@example.com",
-Endpoint: "verifytoken",
-FromName: "Awesome Dot Com",
-Subject: "MagicLink to access your account",
-TextContent: `Hi there,
-
-Click here to access your account $micro_verification_link`,
+	rsp, err := userService.Create(&user.CreateRequest{
+		Email: "joe@example.com",
+Id: "user-1",
+Password: "Password1",
+Username: "joe",
 
 	})
 	fmt.Println(rsp, err)
@@ -290,40 +301,6 @@ func ReadAccountByEmail() {
 	})
 	fmt.Println(rsp, err)
 	
-}
-```
-## SendPasswordResetEmail
-
-Send an email with a verification code to reset password.
-Call "ResetPassword" endpoint once user provides the code.
-
-
-[https://m3o.com/user/api#SendPasswordResetEmail](https://m3o.com/user/api#SendPasswordResetEmail)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/user"
-)
-
-// Send an email with a verification code to reset password.
-// Call "ResetPassword" endpoint once user provides the code.
-func SendPasswordResetEmail() {
-	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.SendPasswordResetEmail(&user.SendPasswordResetEmailRequest{
-		Email: "joe@example.com",
-FromName: "Awesome Dot Com",
-Subject: "Password reset",
-TextContent: `Hi there,
- click here to reset your password: myapp.com/reset/code?=$code`,
-
-	})
-	fmt.Println(rsp, err)
-	
 }
 ```
 ## Delete
@@ -354,13 +331,18 @@ func DeleteUserAccount() {
 	
 }
 ```
-## Login
+## SendVerificationEmail
 
-Login using username or email. The response will return a new session for successful login,
-401 in the case of login failure and 500 for any other error
+Send a verification email to a user.
+Email "from" will be 'noreply@email.m3ocontent.com'.
+The verification link will be injected in the email
+as a template variable, $micro_verification_link e.g
+'Welcome to M3O! Use the link below to verify your email: $micro_verification_link'
+The variable will be replaced with a url similar to:
+'https://user.m3o.com/user/verify?token=a-verification-token&redirectUrl=your-redir-url'
 
 
-[https://m3o.com/user/api#Login](https://m3o.com/user/api#Login)
+[https://m3o.com/user/api#SendVerificationEmail](https://m3o.com/user/api#SendVerificationEmail)
 
 ```go
 package example
@@ -372,25 +354,36 @@ import(
 	"go.m3o.com/user"
 )
 
-// Login using username or email. The response will return a new session for successful login,
-// 401 in the case of login failure and 500 for any other error
-func LogAuserIn() {
+// Send a verification email to a user.
+// Email "from" will be 'noreply@email.m3ocontent.com'.
+// The verification link will be injected in the email
+// as a template variable, $micro_verification_link e.g
+// 'Welcome to M3O! Use the link below to verify your email: $micro_verification_link'
+// The variable will be replaced with a url similar to:
+// 'https://user.m3o.com/user/verify?token=a-verification-token&redirectUrl=your-redir-url'
+func SendVerificationEmail() {
 	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.Login(&user.LoginRequest{
+	rsp, err := userService.SendVerificationEmail(&user.SendVerificationEmailRequest{
 		Email: "joe@example.com",
-Password: "Password1",
+FailureRedirectUrl: "https://m3o.com/verification-failed",
+FromName: "Awesome Dot Com",
+RedirectUrl: "https://m3o.com",
+Subject: "Email verification",
+TextContent: `Hi there,
+
+Please verify your email by clicking this link: $micro_verification_link`,
 
 	})
 	fmt.Println(rsp, err)
 	
 }
 ```
-## Logout
+## VerifyEmail
 
-Logout a user account
+Verify the email address of an account from a token sent in an email to the user.
 
 
-[https://m3o.com/user/api#Logout](https://m3o.com/user/api#Logout)
+[https://m3o.com/user/api#VerifyEmail](https://m3o.com/user/api#VerifyEmail)
 
 ```go
 package example
@@ -402,42 +395,11 @@ import(
 	"go.m3o.com/user"
 )
 
-// Logout a user account
-func LogAuserOut() {
+// Verify the email address of an account from a token sent in an email to the user.
+func VerifyEmail() {
 	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.Logout(&user.LogoutRequest{
-		SessionId: "df91a612-5b24-4634-99ff-240220ab8f55",
-
-	})
-	fmt.Println(rsp, err)
-	
-}
-```
-## Create
-
-Create a new user account. The email address and username for the account must be unique.
-
-
-[https://m3o.com/user/api#Create](https://m3o.com/user/api#Create)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/user"
-)
-
-// Create a new user account. The email address and username for the account must be unique.
-func CreateAnAccount() {
-	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.Create(&user.CreateRequest{
-		Email: "joe@example.com",
-Id: "user-1",
-Password: "Password1",
-Username: "joe",
+	rsp, err := userService.VerifyEmail(&user.VerifyEmailRequest{
+		Token: "012345",
 
 	})
 	fmt.Println(rsp, err)
@@ -472,37 +434,6 @@ Username: "joe",
 	})
 	fmt.Println(rsp, err)
 	
-}
-```
-## UpdatePassword
-
-Update the account password
-
-
-[https://m3o.com/user/api#UpdatePassword](https://m3o.com/user/api#UpdatePassword)
-
-```go
-package example
-
-import(
-	"fmt"
-	"os"
-
-	"go.m3o.com/user"
-)
-
-// Update the account password
-func UpdateTheAccountPassword() {
-	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
-	rsp, err := userService.UpdatePassword(&user.UpdatePasswordRequest{
-		ConfirmPassword: "Password2",
-NewPassword: "Password2",
-OldPassword: "Password1",
-UserId: "user-1",
-
-	})
-	fmt.Println(rsp, err)
-	
 }
 ```
 ## ReadSession
@@ -533,3 +464,72 @@ func ReadAsessionByTheSessionId() {
 	
 }
 ```
+## SendMagicLink
+
+Login using email only - Passwordless
+
+
+[https://m3o.com/user/api#SendMagicLink](https://m3o.com/user/api#SendMagicLink)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/user"
+)
+
+// Login using email only - Passwordless
+func SendAmagicLink() {
+	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := userService.SendMagicLink(&user.SendMagicLinkRequest{
+		Address: "www.example.com",
+Email: "joe@example.com",
+Endpoint: "verifytoken",
+FromName: "Awesome Dot Com",
+Subject: "MagicLink to access your account",
+TextContent: `Hi there,
+
+Click here to access your account $micro_verification_link`,
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```
+## VerifyToken
+
+Check whether the token attached to MagicLink is valid or not.
+Ideally, you need to call this endpoint from your http request
+handler that handles the endpoint which is specified in the
+SendMagicLink request.
+
+
+[https://m3o.com/user/api#VerifyToken](https://m3o.com/user/api#VerifyToken)
+
+```go
+package example
+
+import(
+	"fmt"
+	"os"
+
+	"go.m3o.com/user"
+)
+
+// Check whether the token attached to MagicLink is valid or not.
+// Ideally, you need to call this endpoint from your http request
+// handler that handles the endpoint which is specified in the
+// SendMagicLink request.
+func VerifyAtoken() {
+	userService := user.NewUserService(os.Getenv("M3O_API_TOKEN"))
+	rsp, err := userService.VerifyToken(&user.VerifyTokenRequest{
+		Token: "EdsUiidouJJJLldjlloofUiorkojflsWWdld",
+
+	})
+	fmt.Println(rsp, err)
+	
+}
+```