diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java
similarity index 83%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java
index eab0654c01fc35cbea26bffbcdd52fdbc3947591..ec19625a381cd073aa7d5a2279d1943eaee2bda4 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owners;
 
 public class Owner {
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java
similarity index 94%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java
index 548889c7e480df5a16c93450d0bb39ef07102d17..11be755b22af72fca73e5182b3c013ed47882dc1 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owners;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.samples.petclinic.util.ResponseContext;
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java
similarity index 77%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java
index e151f45e27ca8ccc993969818f27ca668668df06..762ba5dc8af6674e03b2fa20e761c0ac91cd00be 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owners;
 
 import java.util.Collection;
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java
similarity index 95%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java
index fe42ab02cc1a4a99ed333d31716ca044ad0d8bd5..93fd5b9e73b1dc594a6c79dd0c845b985379a102 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owners;
 
 import java.util.Collection;
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java
similarity index 86%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java
index b9da84907b8e405a487e04d301c8c57fca165216..5c3406bf0e32a8f264fd4b5c886c0a8e8f69b707 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.owner;
+package org.springframework.samples.petclinic.owners;
 
 import java.util.Collection;
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java
new file mode 100644
index 0000000000000000000000000000000000000000..6691f557e4afc932a4d4e0d9bd2a71f6ae74334d
--- /dev/null
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java
@@ -0,0 +1,5 @@
+package org.springframework.samples.petclinic.owners.pets;
+
+public enum Gender {
+	MALE, FEMALE
+}
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java
similarity index 84%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java
index e0765ee4c3a51484c7c362786fbf93fc30898574..63f189d3a32c52f828d963cbbe8a5c930f66bc59 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.pet;
+package org.springframework.samples.petclinic.owners.pets;
 
 import java.util.Date;
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java
similarity index 95%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java
index 1067540718dc968f391bb0722a7071392b8e2ec2..d789f9151356d619800f6999d92300f97730fb3d 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.pet;
+package org.springframework.samples.petclinic.owners.pets;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.samples.petclinic.util.ResponseContext;
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java
similarity index 63%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java
index c3b52f4f1a6b3fb55e74fcd0abb1e6a6445b81b6..76afff837574ee17b4ed69a11d46cb4c68987e63 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.pet;
+package org.springframework.samples.petclinic.owners.pets;
 
 public interface PetRepository {
 	
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java
similarity index 79%
rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java
rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java
index 1c0e731a5c304c8be932e3315a4ca46cd78237a3..0dae2f563b07dfe0d617328d0ff3ef4d28e45111 100644
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java
+++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.pet;
+package org.springframework.samples.petclinic.owners.pets;
 
 import org.springframework.stereotype.Repository;
 
diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java
deleted file mode 100644
index e67a95aa6fa37753a719e22e0565501d9d862a89..0000000000000000000000000000000000000000
--- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.springframework.samples.petclinic.pet;
-
-public enum Gender {
-	MALE, FEMALE
-}