diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java b/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java
index f912da8..1a432bc 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java
@@ -12,14 +12,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 
-import com.fjordtek.bookstore.model.Author;
-import com.fjordtek.bookstore.model.AuthorRepository;
-import com.fjordtek.bookstore.model.Book;
-import com.fjordtek.bookstore.model.BookHash;
-import com.fjordtek.bookstore.model.BookHashRepository;
-import com.fjordtek.bookstore.model.BookRepository;
-import com.fjordtek.bookstore.model.Category;
-import com.fjordtek.bookstore.model.CategoryRepository;
+import com.fjordtek.bookstore.model.book.Author;
+import com.fjordtek.bookstore.model.book.AuthorRepository;
+import com.fjordtek.bookstore.model.book.Book;
+import com.fjordtek.bookstore.model.book.BookHash;
+import com.fjordtek.bookstore.model.book.BookHashRepository;
+import com.fjordtek.bookstore.model.book.BookRepository;
+import com.fjordtek.bookstore.model.book.Category;
+import com.fjordtek.bookstore.model.book.CategoryRepository;
 
 /**
 *
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/Author.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Author.java
similarity index 98%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/Author.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/Author.java
index ec7ad3a..98a93f8 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/Author.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Author.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.util.List;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorJsonSerializer.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorJsonSerializer.java
similarity index 96%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorJsonSerializer.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorJsonSerializer.java
index f6b7d75..2411925 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorJsonSerializer.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorJsonSerializer.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.io.IOException;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorRepository.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorRepository.java
similarity index 96%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorRepository.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorRepository.java
index 576843b..e58be42 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/AuthorRepository.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/AuthorRepository.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.util.List;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Book.java
similarity index 99%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/Book.java
index 88bb104..f176323 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Book.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.math.BigDecimal;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookEventHandler.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookEventHandler.java
similarity index 97%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/BookEventHandler.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookEventHandler.java
index bcdeaff..d21639a 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookEventHandler.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookEventHandler.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.core.annotation.HandleAfterCreate;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookHash.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHash.java
similarity index 98%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/BookHash.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHash.java
index ae8a29e..796fb2d 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookHash.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHash.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.security.SecureRandom;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookHashRepository.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHashRepository.java
similarity index 96%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/BookHashRepository.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHashRepository.java
index 9a2b6c6..9d3a98e 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookHashRepository.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookHashRepository.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookRepository.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookRepository.java
similarity index 97%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/BookRepository.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookRepository.java
index eb8f2cc..a829e80 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/BookRepository.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/BookRepository.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/Category.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Category.java
similarity index 98%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/Category.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/Category.java
index b948867..603d19e 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/Category.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/Category.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.util.List;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryJsonSerializer.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryJsonSerializer.java
similarity index 96%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryJsonSerializer.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryJsonSerializer.java
index f6faf5a..2913f49 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryJsonSerializer.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryJsonSerializer.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.io.IOException;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryRepository.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryRepository.java
similarity index 95%
rename from bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryRepository.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryRepository.java
index 0f41411..580b522 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/model/CategoryRepository.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/book/CategoryRepository.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.model;
+package com.fjordtek.bookstore.model.book;
 
 import java.util.List;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java b/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
index 5ea5190..7025249 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
@@ -5,9 +5,9 @@ package com.fjordtek.bookstore.service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.fjordtek.bookstore.model.Author;
-import com.fjordtek.bookstore.model.AuthorRepository;
-import com.fjordtek.bookstore.model.Book;
+import com.fjordtek.bookstore.model.book.Author;
+import com.fjordtek.bookstore.model.book.AuthorRepository;
+import com.fjordtek.bookstore.model.book.Book;
 
 /**
 *
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
index 8d9c2b9..cf15576 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
@@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.fjordtek.bookstore.model.Book;
-import com.fjordtek.bookstore.model.BookEventHandler;
-import com.fjordtek.bookstore.model.BookRepository;
-import com.fjordtek.bookstore.model.CategoryRepository;
+import com.fjordtek.bookstore.model.book.Book;
+import com.fjordtek.bookstore.model.book.BookEventHandler;
+import com.fjordtek.bookstore.model.book.BookRepository;
+import com.fjordtek.bookstore.model.book.CategoryRepository;
 import com.fjordtek.bookstore.service.BookAuthorHelper;
 import com.fjordtek.bookstore.service.HttpServerLogger;
 
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
index 6e7e6f8..8f3faaa 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
@@ -27,12 +27,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.fjordtek.bookstore.model.AuthorRepository;
-import com.fjordtek.bookstore.model.Book;
-import com.fjordtek.bookstore.model.BookHash;
-import com.fjordtek.bookstore.model.BookHashRepository;
-import com.fjordtek.bookstore.model.BookRepository;
-import com.fjordtek.bookstore.model.CategoryRepository;
+import com.fjordtek.bookstore.model.book.AuthorRepository;
+import com.fjordtek.bookstore.model.book.Book;
+import com.fjordtek.bookstore.model.book.BookHash;
+import com.fjordtek.bookstore.model.book.BookHashRepository;
+import com.fjordtek.bookstore.model.book.BookRepository;
+import com.fjordtek.bookstore.model.book.CategoryRepository;
 import com.fjordtek.bookstore.service.BigDecimalPropertyEditor;
 import com.fjordtek.bookstore.service.BookAuthorHelper;
 import com.fjordtek.bookstore.service.HttpServerLogger;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
index b2cff02..072b7a3 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
@@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fjordtek.bookstore.model.Book;
-import com.fjordtek.bookstore.model.BookHashRepository;
-import com.fjordtek.bookstore.model.BookRepository;
+import com.fjordtek.bookstore.model.book.Book;
+import com.fjordtek.bookstore.model.book.BookHashRepository;
+import com.fjordtek.bookstore.model.book.BookRepository;
 import com.fjordtek.bookstore.service.HttpServerLogger;
 
 /**