diff --git a/domain-driven-hex-actor/cmd/data/main.go b/domain-hex-actor/cmd/data/main.go
similarity index 80%
rename from domain-driven-hex-actor/cmd/data/main.go
rename to domain-hex-actor/cmd/data/main.go
index 984a73c..22ed9d2 100644
--- a/domain-driven-hex-actor/cmd/data/main.go
+++ b/domain-hex-actor/cmd/data/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/storage/json"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/storage/json"
 	"fmt"
 	"time"
 )
diff --git a/domain-driven-hex-actor/cmd/server/main.go b/domain-hex-actor/cmd/server/main.go
similarity index 66%
rename from domain-driven-hex-actor/cmd/server/main.go
rename to domain-hex-actor/cmd/server/main.go
index dd1f2fc..7fde097 100644
--- a/domain-driven-hex-actor/cmd/server/main.go
+++ b/domain-hex-actor/cmd/server/main.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/storage/memory"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/storage/json"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/http/rest"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/storage/memory"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/storage/json"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/http/rest"
 )
 
 // StorageType defines available storage types
diff --git a/domain-driven-hex-actor/pkg/adding/beer.go b/domain-hex-actor/pkg/adding/beer.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/adding/beer.go
rename to domain-hex-actor/pkg/adding/beer.go
diff --git a/domain-driven-hex-actor/pkg/adding/sample_beers.go b/domain-hex-actor/pkg/adding/sample_beers.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/adding/sample_beers.go
rename to domain-hex-actor/pkg/adding/sample_beers.go
diff --git a/domain-driven-hex-actor/pkg/adding/service.go b/domain-hex-actor/pkg/adding/service.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/adding/service.go
rename to domain-hex-actor/pkg/adding/service.go
diff --git a/domain-driven-hex/pkg/http/rest/handler.go b/domain-hex-actor/pkg/http/rest/handler.go
similarity index 93%
rename from domain-driven-hex/pkg/http/rest/handler.go
rename to domain-hex-actor/pkg/http/rest/handler.go
index 3d1ebe9..6be63b8 100644
--- a/domain-driven-hex/pkg/http/rest/handler.go
+++ b/domain-hex-actor/pkg/http/rest/handler.go
@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"strconv"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/reviewing"
 )
 
 func Handler(a adding.Service, l listing.Service, r reviewing.Service) http.Handler {
diff --git a/domain-driven-hex-actor/pkg/listing/beer.go b/domain-hex-actor/pkg/listing/beer.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/listing/beer.go
rename to domain-hex-actor/pkg/listing/beer.go
diff --git a/domain-driven-hex-actor/pkg/listing/review.go b/domain-hex-actor/pkg/listing/review.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/listing/review.go
rename to domain-hex-actor/pkg/listing/review.go
diff --git a/domain-driven-hex-actor/pkg/listing/service.go b/domain-hex-actor/pkg/listing/service.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/listing/service.go
rename to domain-hex-actor/pkg/listing/service.go
diff --git a/domain-driven-hex-actor/pkg/reviewing/review.go b/domain-hex-actor/pkg/reviewing/review.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/reviewing/review.go
rename to domain-hex-actor/pkg/reviewing/review.go
diff --git a/domain-driven-hex-actor/pkg/reviewing/sample_reviews.go b/domain-hex-actor/pkg/reviewing/sample_reviews.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/reviewing/sample_reviews.go
rename to domain-hex-actor/pkg/reviewing/sample_reviews.go
diff --git a/domain-driven-hex-actor/pkg/reviewing/service.go b/domain-hex-actor/pkg/reviewing/service.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/reviewing/service.go
rename to domain-hex-actor/pkg/reviewing/service.go
diff --git a/domain-driven-hex-actor/pkg/storage/json/beer.go b/domain-hex-actor/pkg/storage/json/beer.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/storage/json/beer.go
rename to domain-hex-actor/pkg/storage/json/beer.go
diff --git a/domain-driven-hex/pkg/storage/json/repository.go b/domain-hex-actor/pkg/storage/json/repository.go
similarity index 94%
rename from domain-driven-hex/pkg/storage/json/repository.go
rename to domain-hex-actor/pkg/storage/json/repository.go
index 497240c..be4f1dd 100644
--- a/domain-driven-hex/pkg/storage/json/repository.go
+++ b/domain-hex-actor/pkg/storage/json/repository.go
@@ -7,9 +7,9 @@ import (
 	"github.com/nanobox-io/golang-scribble"
 	"strconv"
 	"time"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/listing"
 	"runtime"
 	"path"
 )
diff --git a/domain-driven-hex-actor/pkg/storage/json/review.go b/domain-hex-actor/pkg/storage/json/review.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/storage/json/review.go
rename to domain-hex-actor/pkg/storage/json/review.go
diff --git a/domain-driven-hex-actor/pkg/storage/memory/beer.go b/domain-hex-actor/pkg/storage/memory/beer.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/storage/memory/beer.go
rename to domain-hex-actor/pkg/storage/memory/beer.go
diff --git a/domain-driven-hex/pkg/storage/memory/repository.go b/domain-hex-actor/pkg/storage/memory/repository.go
similarity index 91%
rename from domain-driven-hex/pkg/storage/memory/repository.go
rename to domain-hex-actor/pkg/storage/memory/repository.go
index e7a5f31..fe795a4 100644
--- a/domain-driven-hex/pkg/storage/memory/repository.go
+++ b/domain-hex-actor/pkg/storage/memory/repository.go
@@ -3,9 +3,9 @@ package memory
 import (
 	"time"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex-actor/pkg/reviewing"
 )
 
 // Memory storage keeps data in memory
diff --git a/domain-driven-hex-actor/pkg/storage/memory/review.go b/domain-hex-actor/pkg/storage/memory/review.go
similarity index 100%
rename from domain-driven-hex-actor/pkg/storage/memory/review.go
rename to domain-hex-actor/pkg/storage/memory/review.go
diff --git a/domain-driven-hex/cmd/beer-server/main.go b/domain-hex/cmd/beer-server/main.go
similarity index 68%
rename from domain-driven-hex/cmd/beer-server/main.go
rename to domain-hex/cmd/beer-server/main.go
index 3571985..3ae5561 100644
--- a/domain-driven-hex/cmd/beer-server/main.go
+++ b/domain-hex/cmd/beer-server/main.go
@@ -5,12 +5,12 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/http/rest"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/storage/memory"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/storage/json"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/http/rest"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/storage/memory"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/storage/json"
 )
 
 // StorageType defines available storage types
diff --git a/domain-driven-hex/cmd/sample-data/main.go b/domain-hex/cmd/sample-data/main.go
similarity index 62%
rename from domain-driven-hex/cmd/sample-data/main.go
rename to domain-hex/cmd/sample-data/main.go
index 8c4d9c5..62cbd01 100644
--- a/domain-driven-hex/cmd/sample-data/main.go
+++ b/domain-hex/cmd/sample-data/main.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/storage/json"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex/storage/json"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
 )
 
 func main() {
diff --git a/domain-driven-hex/pkg/adding/beer.go b/domain-hex/pkg/adding/beer.go
similarity index 100%
rename from domain-driven-hex/pkg/adding/beer.go
rename to domain-hex/pkg/adding/beer.go
diff --git a/domain-driven-hex/pkg/adding/sample_beers.go b/domain-hex/pkg/adding/sample_beers.go
similarity index 100%
rename from domain-driven-hex/pkg/adding/sample_beers.go
rename to domain-hex/pkg/adding/sample_beers.go
diff --git a/domain-driven-hex/pkg/adding/service.go b/domain-hex/pkg/adding/service.go
similarity index 100%
rename from domain-driven-hex/pkg/adding/service.go
rename to domain-hex/pkg/adding/service.go
diff --git a/domain-driven-hex-actor/pkg/http/rest/handler.go b/domain-hex/pkg/http/rest/handler.go
similarity index 93%
rename from domain-driven-hex-actor/pkg/http/rest/handler.go
rename to domain-hex/pkg/http/rest/handler.go
index 4dd2d21..ab3ba0d 100644
--- a/domain-driven-hex-actor/pkg/http/rest/handler.go
+++ b/domain-hex/pkg/http/rest/handler.go
@@ -6,9 +6,9 @@ import (
 	"encoding/json"
 	"strconv"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
 )
 
 func Handler(a adding.Service, l listing.Service, r reviewing.Service) http.Handler {
diff --git a/domain-driven-hex/pkg/listing/beer.go b/domain-hex/pkg/listing/beer.go
similarity index 100%
rename from domain-driven-hex/pkg/listing/beer.go
rename to domain-hex/pkg/listing/beer.go
diff --git a/domain-driven-hex/pkg/listing/review.go b/domain-hex/pkg/listing/review.go
similarity index 100%
rename from domain-driven-hex/pkg/listing/review.go
rename to domain-hex/pkg/listing/review.go
diff --git a/domain-driven-hex/pkg/listing/service.go b/domain-hex/pkg/listing/service.go
similarity index 100%
rename from domain-driven-hex/pkg/listing/service.go
rename to domain-hex/pkg/listing/service.go
diff --git a/domain-driven-hex/pkg/reviewing/review.go b/domain-hex/pkg/reviewing/review.go
similarity index 100%
rename from domain-driven-hex/pkg/reviewing/review.go
rename to domain-hex/pkg/reviewing/review.go
diff --git a/domain-driven-hex/pkg/reviewing/sample_reviews.go b/domain-hex/pkg/reviewing/sample_reviews.go
similarity index 100%
rename from domain-driven-hex/pkg/reviewing/sample_reviews.go
rename to domain-hex/pkg/reviewing/sample_reviews.go
diff --git a/domain-driven-hex/pkg/reviewing/service.go b/domain-hex/pkg/reviewing/service.go
similarity index 100%
rename from domain-driven-hex/pkg/reviewing/service.go
rename to domain-hex/pkg/reviewing/service.go
diff --git a/domain-driven-hex/pkg/storage/json/beer.go b/domain-hex/pkg/storage/json/beer.go
similarity index 100%
rename from domain-driven-hex/pkg/storage/json/beer.go
rename to domain-hex/pkg/storage/json/beer.go
diff --git a/domain-driven-hex-actor/pkg/storage/json/repository.go b/domain-hex/pkg/storage/json/repository.go
similarity index 94%
rename from domain-driven-hex-actor/pkg/storage/json/repository.go
rename to domain-hex/pkg/storage/json/repository.go
index 47da54e..aa09408 100644
--- a/domain-driven-hex-actor/pkg/storage/json/repository.go
+++ b/domain-hex/pkg/storage/json/repository.go
@@ -7,9 +7,9 @@ import (
 	"github.com/nanobox-io/golang-scribble"
 	"strconv"
 	"time"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/listing"
 	"runtime"
 	"path"
 )
diff --git a/domain-driven-hex/pkg/storage/json/review.go b/domain-hex/pkg/storage/json/review.go
similarity index 100%
rename from domain-driven-hex/pkg/storage/json/review.go
rename to domain-hex/pkg/storage/json/review.go
diff --git a/domain-driven-hex/pkg/storage/memory/beer.go b/domain-hex/pkg/storage/memory/beer.go
similarity index 100%
rename from domain-driven-hex/pkg/storage/memory/beer.go
rename to domain-hex/pkg/storage/memory/beer.go
diff --git a/domain-driven-hex-actor/pkg/storage/memory/repository.go b/domain-hex/pkg/storage/memory/repository.go
similarity index 91%
rename from domain-driven-hex-actor/pkg/storage/memory/repository.go
rename to domain-hex/pkg/storage/memory/repository.go
index 11f9b24..9d8c617 100644
--- a/domain-driven-hex-actor/pkg/storage/memory/repository.go
+++ b/domain-hex/pkg/storage/memory/repository.go
@@ -3,9 +3,9 @@ package memory
 import (
 	"time"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/listing"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/adding"
-	"github.com/katzien/go-structure-examples/domain-driven-hex-actor/pkg/reviewing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/listing"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/adding"
+	"github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
 )
 
 // Memory storage keeps data in memory
diff --git a/domain-driven-hex/pkg/storage/memory/review.go b/domain-hex/pkg/storage/memory/review.go
similarity index 100%
rename from domain-driven-hex/pkg/storage/memory/review.go
rename to domain-hex/pkg/storage/memory/review.go
diff --git a/domain-driven/adding/endpoint.go b/domain/adding/endpoint.go
similarity index 91%
rename from domain-driven/adding/endpoint.go
rename to domain/adding/endpoint.go
index 2bb741b..637bfe7 100644
--- a/domain-driven/adding/endpoint.go
+++ b/domain/adding/endpoint.go
@@ -4,7 +4,7 @@ import (
 	"github.com/julienschmidt/httprouter"
 	"net/http"
 	"encoding/json"
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
+	"github.com/katzien/go-structure-examples/domain/beers"
 )
 
 // MakeAddBeerEndpoint creates a handler for POST /beers requests
diff --git a/domain-driven/adding/service.go b/domain/adding/service.go
similarity index 91%
rename from domain-driven/adding/service.go
rename to domain/adding/service.go
index 2160a41..06054a0 100644
--- a/domain-driven/adding/service.go
+++ b/domain/adding/service.go
@@ -1,7 +1,7 @@
 package adding
 
 import (
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
+	"github.com/katzien/go-structure-examples/domain/beers"
 )
 
 // Service provides beer adding operations
diff --git a/domain-driven/beers/beer.go b/domain/beers/beer.go
similarity index 100%
rename from domain-driven/beers/beer.go
rename to domain/beers/beer.go
diff --git a/domain-driven/beers/sample_beers.go b/domain/beers/sample_beers.go
similarity index 100%
rename from domain-driven/beers/sample_beers.go
rename to domain/beers/sample_beers.go
diff --git a/domain-driven/listing/endpoint.go b/domain/listing/endpoint.go
similarity index 96%
rename from domain-driven/listing/endpoint.go
rename to domain/listing/endpoint.go
index 2d47492..91f5f6e 100644
--- a/domain-driven/listing/endpoint.go
+++ b/domain/listing/endpoint.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"strconv"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
+	"github.com/katzien/go-structure-examples/domain/beers"
 )
 
 type Handler func(http.ResponseWriter, *http.Request, httprouter.Params)
diff --git a/domain-driven/listing/service.go b/domain/listing/service.go
similarity index 87%
rename from domain-driven/listing/service.go
rename to domain/listing/service.go
index ffc392a..ef94fe7 100644
--- a/domain-driven/listing/service.go
+++ b/domain/listing/service.go
@@ -1,8 +1,8 @@
 package listing
 
 import (
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
+	"github.com/katzien/go-structure-examples/domain/reviews"
+	"github.com/katzien/go-structure-examples/domain/beers"
 )
 
 // Service provides beer or review listing operations
diff --git a/domain-driven/main.go b/domain/main.go
similarity index 77%
rename from domain-driven/main.go
rename to domain/main.go
index 85c9e5a..459bcaa 100644
--- a/domain-driven/main.go
+++ b/domain/main.go
@@ -6,12 +6,12 @@ import (
 	"net/http"
 
 	"github.com/julienschmidt/httprouter"
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
-	"github.com/katzien/go-structure-examples/domain-driven/storage"
-	"github.com/katzien/go-structure-examples/domain-driven/adding"
-	"github.com/katzien/go-structure-examples/domain-driven/reviewing"
-	"github.com/katzien/go-structure-examples/domain-driven/listing"
+	"github.com/katzien/go-structure-examples/domain/beers"
+	"github.com/katzien/go-structure-examples/domain/reviews"
+	"github.com/katzien/go-structure-examples/domain/storage"
+	"github.com/katzien/go-structure-examples/domain/adding"
+	"github.com/katzien/go-structure-examples/domain/reviewing"
+	"github.com/katzien/go-structure-examples/domain/listing"
 )
 
 func main() {
diff --git a/domain-driven/reviewing/endpoint.go b/domain/reviewing/endpoint.go
similarity index 93%
rename from domain-driven/reviewing/endpoint.go
rename to domain/reviewing/endpoint.go
index 3b262d7..ea2b33b 100644
--- a/domain-driven/reviewing/endpoint.go
+++ b/domain/reviewing/endpoint.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"strconv"
 	"fmt"
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
+	"github.com/katzien/go-structure-examples/domain/reviews"
 )
 
 type Handler func(http.ResponseWriter, *http.Request, httprouter.Params)
diff --git a/domain-driven/reviewing/service.go b/domain/reviewing/service.go
similarity index 91%
rename from domain-driven/reviewing/service.go
rename to domain/reviewing/service.go
index c128301..b8a5ef1 100644
--- a/domain-driven/reviewing/service.go
+++ b/domain/reviewing/service.go
@@ -1,7 +1,7 @@
 package reviewing
 
 import (
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
+	"github.com/katzien/go-structure-examples/domain/reviews"
 )
 
 // Service provides review adding operations
diff --git a/domain-driven/reviews/review.go b/domain/reviews/review.go
similarity index 100%
rename from domain-driven/reviews/review.go
rename to domain/reviews/review.go
diff --git a/domain-driven/reviews/sample_reviews.go b/domain/reviews/sample_reviews.go
similarity index 100%
rename from domain-driven/reviews/sample_reviews.go
rename to domain/reviews/sample_reviews.go
diff --git a/domain-driven/storage/json.go b/domain/storage/json.go
similarity index 96%
rename from domain-driven/storage/json.go
rename to domain/storage/json.go
index b8a55c3..d0f0adb 100644
--- a/domain-driven/storage/json.go
+++ b/domain/storage/json.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/nanobox-io/golang-scribble"
 	"strconv"
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
+	"github.com/katzien/go-structure-examples/domain/beers"
+	"github.com/katzien/go-structure-examples/domain/reviews"
 	"time"
 )
 
diff --git a/domain-driven/storage/memory.go b/domain/storage/memory.go
similarity index 92%
rename from domain-driven/storage/memory.go
rename to domain/storage/memory.go
index 838f677..3bb8948 100644
--- a/domain-driven/storage/memory.go
+++ b/domain/storage/memory.go
@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/katzien/go-structure-examples/domain-driven/beers"
-	"github.com/katzien/go-structure-examples/domain-driven/reviews"
+	"github.com/katzien/go-structure-examples/domain/beers"
+	"github.com/katzien/go-structure-examples/domain/reviews"
 	"time"
 	"fmt"
 )
diff --git a/domain-driven/storage/type.go b/domain/storage/type.go
similarity index 100%
rename from domain-driven/storage/type.go
rename to domain/storage/type.go
diff --git a/modular/storage/storage.go b/modular/storage/storage.go
index 5e16c5a..e105be7 100644
--- a/modular/storage/storage.go
+++ b/modular/storage/storage.go
@@ -3,7 +3,7 @@ package storage
 import "github.com/katzien/go-structure-examples/modular/beers"
 import "github.com/katzien/go-structure-examples/modular/reviews"
 
-// StorageType defines available storage types
+// Type defines available storage types
 type Type int
 
 const (