diff --git a/healthcheck.go b/healthcheck.go
index f6843c8..dff8383 100644
--- a/healthcheck.go
+++ b/healthcheck.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/es"
 	health "github.com/Financial-Times/go-fthealth/v1_1"
 	"github.com/Financial-Times/go-logger"
diff --git a/main.go b/main.go
index 130c651..e785b94 100644
--- a/main.go
+++ b/main.go
@@ -9,14 +9,14 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/es"
-	"github.com/Financial-Times/content-rw-elasticsearch/messaging"
 	health "github.com/Financial-Times/go-fthealth/v1_1"
 	"github.com/Financial-Times/go-logger"
 	"github.com/Financial-Times/message-queue-gonsumer/consumer"
 	status "github.com/Financial-Times/service-status-go/httphandlers"
 	"github.com/jawher/mow.cli"
+	"github.com/Financial-Times/content-rw-elasticsearch/service"
 )
 
 const (
@@ -140,14 +140,14 @@ func main() {
 			},
 		}
 
-		service := es.NewService(*indexName)
+		svc := es.NewService(*indexName)
 		var wg sync.WaitGroup
 		concordanceApiService := concept.NewConcordanceApiService(*publicConcordancesEndpoint, httpClient)
-		indexer := messaging.NewIndexer(service, concordanceApiService, httpClient, queueConfig, &wg, es.NewClient)
+		indexer := service.NewIndexer(svc, concordanceApiService, httpClient, queueConfig, &wg, es.NewClient)
 
 		indexer.Start(*appSystemCode, *appName, *indexName, *port, accessConfig, httpClient)
 
-		healthService := newHealthService(&queueConfig, service, httpClient, concordanceApiService, *appSystemCode)
+		healthService := newHealthService(&queueConfig, svc, httpClient, concordanceApiService, *appSystemCode)
 		serveAdminEndpoints(healthService, *appSystemCode, *appName, *port)
 
 		indexer.Stop()
diff --git a/concept/concordance.go b/service/concept/concordance.go
similarity index 94%
rename from concept/concordance.go
rename to service/concept/concordance.go
index 050d9f9..d9e51ed 100644
--- a/concept/concordance.go
+++ b/service/concept/concordance.go
@@ -15,23 +15,23 @@ const (
 	uppAuthority           = "http://api.ft.com/system/UPP"
 )
 
-type concept struct {
+type Concept struct {
 	ID     string `json:"id"`
 	APIURL string `json:"apiUrl,omitempty"`
 }
 
-type identifier struct {
+type Identifier struct {
 	IdentifierValue string `json:"identifierValue"`
 	Authority       string `json:"authority"`
 }
 
-type concordance struct {
-	Concept    concept    `json:"concept"`
-	Identifier identifier `json:"identifier"`
+type Concordance struct {
+	Concept    Concept    `json:"concept"`
+	Identifier Identifier `json:"identifier"`
 }
 
 type ConcordancesResponse struct {
-	Concordances []concordance `json:"concordances"`
+	Concordances []Concordance `json:"concordances"`
 }
 
 type ConceptModel struct {
diff --git a/concept/concordance_test.go b/service/concept/concordance_test.go
similarity index 98%
rename from concept/concordance_test.go
rename to service/concept/concordance_test.go
index 0c0f492..d4672b6 100644
--- a/concept/concordance_test.go
+++ b/service/concept/concordance_test.go
@@ -80,13 +80,13 @@ func TestConcordanceApiService_GetConceptsSuccessfully(t *testing.T) {
 	sampleID := ThingURIPrefix + uuid.NewRandom().String()
 
 	sampleResponse := ConcordancesResponse{
-		Concordances: []concordance{
+		Concordances: []Concordance{
 			{
-				Concept: concept{
+				Concept: Concept{
 					ID:     sampleID,
 					APIURL: sampleID,
 				},
-				Identifier: identifier{
+				Identifier: Identifier{
 					Authority:       tmeAuthority,
 					IdentifierValue: "TME-ID",
 				},
diff --git a/messaging/mapper.go b/service/mapper.go
similarity index 98%
rename from messaging/mapper.go
rename to service/mapper.go
index 1d05aa7..6d11751 100644
--- a/messaging/mapper.go
+++ b/service/mapper.go
@@ -1,13 +1,13 @@
-package messaging
+package service
 
 import (
 	"encoding/base64"
 	"strings"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/content"
-	"github.com/Financial-Times/content-rw-elasticsearch/messaging/utils"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/utils"
 	"github.com/Financial-Times/go-logger"
 	"github.com/Financial-Times/uuid-utils-go"
 	"github.com/pkg/errors"
diff --git a/messaging/mapper_test.go b/service/mapper_test.go
similarity index 97%
rename from messaging/mapper_test.go
rename to service/mapper_test.go
index 3c0e39d..cad0887 100644
--- a/messaging/mapper_test.go
+++ b/service/mapper_test.go
@@ -1,4 +1,4 @@
-package messaging
+package service
 
 import (
 	"encoding/json"
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/content"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/messaging/message_handler.go b/service/message_handler.go
similarity index 98%
rename from messaging/message_handler.go
rename to service/message_handler.go
index 29c10cc..5163df4 100644
--- a/messaging/message_handler.go
+++ b/service/message_handler.go
@@ -1,4 +1,4 @@
-package messaging
+package service
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/content"
 	"github.com/Financial-Times/content-rw-elasticsearch/es"
 	"github.com/Financial-Times/go-logger"
diff --git a/messaging/message_handler_test.go b/service/message_handler_test.go
similarity index 99%
rename from messaging/message_handler_test.go
rename to service/message_handler_test.go
index 9fbae32..7306c81 100644
--- a/messaging/message_handler_test.go
+++ b/service/message_handler_test.go
@@ -1,4 +1,4 @@
-package messaging
+package service
 
 import (
 	"io/ioutil"
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/service/concept"
 	"github.com/Financial-Times/content-rw-elasticsearch/es"
 	logTest "github.com/Financial-Times/go-logger/test"
 	"github.com/Financial-Times/message-queue-gonsumer/consumer"
diff --git a/messaging/testdata/exampleConcordanceResponse.json b/service/testdata/exampleConcordanceResponse.json
similarity index 100%
rename from messaging/testdata/exampleConcordanceResponse.json
rename to service/testdata/exampleConcordanceResponse.json
diff --git a/messaging/testdata/exampleElasticModel.json b/service/testdata/exampleElasticModel.json
similarity index 100%
rename from messaging/testdata/exampleElasticModel.json
rename to service/testdata/exampleElasticModel.json
diff --git a/messaging/testdata/exampleEnrichedContentModel.json b/service/testdata/exampleEnrichedContentModel.json
similarity index 100%
rename from messaging/testdata/exampleEnrichedContentModel.json
rename to service/testdata/exampleEnrichedContentModel.json
diff --git a/messaging/testdata/testConcordanceResponse1.json b/service/testdata/testConcordanceResponse1.json
similarity index 100%
rename from messaging/testdata/testConcordanceResponse1.json
rename to service/testdata/testConcordanceResponse1.json
diff --git a/messaging/testdata/testElasticModel1.json b/service/testdata/testElasticModel1.json
similarity index 100%
rename from messaging/testdata/testElasticModel1.json
rename to service/testdata/testElasticModel1.json
diff --git a/messaging/testdata/testElasticModel2.json b/service/testdata/testElasticModel2.json
similarity index 100%
rename from messaging/testdata/testElasticModel2.json
rename to service/testdata/testElasticModel2.json
diff --git a/messaging/testdata/testEnrichedContentModel1.json b/service/testdata/testEnrichedContentModel1.json
similarity index 100%
rename from messaging/testdata/testEnrichedContentModel1.json
rename to service/testdata/testEnrichedContentModel1.json
diff --git a/messaging/testdata/testEnrichedContentModel2.json b/service/testdata/testEnrichedContentModel2.json
similarity index 100%
rename from messaging/testdata/testEnrichedContentModel2.json
rename to service/testdata/testEnrichedContentModel2.json
diff --git a/messaging/testdata/testEnrichedContentModel3.json b/service/testdata/testEnrichedContentModel3.json
similarity index 100%
rename from messaging/testdata/testEnrichedContentModel3.json
rename to service/testdata/testEnrichedContentModel3.json
diff --git a/messaging/utils/transformer.go b/service/utils/transformer.go
similarity index 100%
rename from messaging/utils/transformer.go
rename to service/utils/transformer.go
diff --git a/messaging/utils/transformer_test.go b/service/utils/transformer_test.go
similarity index 100%
rename from messaging/utils/transformer_test.go
rename to service/utils/transformer_test.go