diff --git a/.travis.yml b/.travis.yml
index e55f2b2b6..f7d78f1a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ install: true
 
 addons:
   sonarcloud:
-    organization: "nqkavkey"
+    organization: "bpsdproject"
     token:
-      secure: "MP10DlQtkxqjU+wU70/Y178YOq5cBC9bx0xVsew8gsNwqrRPj6SSXLQBd9WCTIfDd2uuE6rHplTbwFIEjIoPZ3Kv8DyyDaqcT2J0Pjfxah4yueB1FXZL4OLgV41f/0OE4DKRIrB7URHfGhIc0z7lxslI3l3Q0yM9v8v3sjX8OLbt4C3UkPnOW6+ad+YX8BoS4bhp+U2IodQfWuKg9HSEdaAwB37bW+WDzHECKc4B4V4kl0eoDvItz5L8UJ3c0cuhe545Xe1Kx3i8zsxluJQae3sqxnaZFfEHGQBYVZ4MLp1FJIX1RBIevBJLv7+AeoUxBd6ZNFNqPFkUKvSpSFBOEIRQU61VXmxDonPniTx5zMMGZl1g4v3tlUQIy2ISfkHmwZBhVazx59wSJ7id2zS+qvfxQJOU/UPUxbqzPq+6b+uRo0g982ORECC4w1iO0ocYGs6RAZ/LNwWNg1hl28EqpPaE93tGgqu+S6gVkDBmVd/ByE/uCPBTZNkL5YGbF7C0Xoe+HZ2GYhb65mzIwjjuCVoo8WrW35/ruBSa/EnCwDpIh34CPnEVlIYkCtCSseBW7jJD94MIY7h6jLcHfuydeSlDfXL0qbDx3YTxE19cKLM8akbxoZ4LYejQPvdSP4FPdyx7bgw2mmSDbmVEPe59OL+hNgDXQbOP2ccWVVYRyo0="
+      secure: "GBSEwXoZaohdFQyW5yJ3h6t8+HIztd+sEMS8jt10zo5tnenrGNv59YTl7B5VwxR2X/mJcdLsouR4z81TZfP4FX93NZAKwAdkj1d3yAyvEDYSlLywI7Xp3BGcO7Zc4mnHAU+yMhVI98Ww6C45OjirUgBT8STmjLTXk2yuA9T6IttwAmGdLzzzPjon710/6mIY3MzoqRpyhGhuJJjbJLA9BM5h1X79ikbOMk4e2ig3KaTIANS3oeCiQlNHgdikBZcsxow7qMXA5d8mgrBJnKH52EerLbMgVuKPBxdV+RMZQxOLZR6xzg5EQVUpoXCG8EqMbZw6lEdqfIYasm8EPQPaRM4fT6zIbJoQEFFXCIL1Wht7h0pO5RTavPE9jcpjni/QG+MAcr+v80/8RGOQ5MhQ/vF6T5DDf6J/03zAGX4LpPOb7s/8YuWWz+wB+uFYXsdZLOhFb8uuAyEiBzyXIn3ZgkLHxo57sGVgfSDiLgKGea7fIw+xN72JzTKts19jR1x+Sy6SvIgOJdjdmV+qzpbkn1nFtXo0t73RxwQkLLBx5hin02fEr1jWVXszVGCqKrxwglE0oTucMP6qtujMoqNo+eUUE064IAhRl9EPPcDMezctIKLp4vTUP3X5RCL1KRfE8uzeaY+Nnd+/DCh71Nhr4AHm570ISw6q7mKeStaB1dQ="
 
 jdk: oraclejdk8
 
diff --git a/pom.xml b/pom.xml
index ff677d097..747032c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   xmlns="http://maven.apache.org/POM/4.0.0"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.samples</groupId>
+  <groupId>org.springframework.samples.bpsd</groupId>
   <artifactId>spring-petclinic</artifactId>
   <version>1.5.1</version>
 
@@ -125,7 +125,7 @@
         <artifactId>spring-boot-maven-plugin</artifactId>
         <executions>
           <execution>
-            <!-- Spring Boot Actuator displays build-related information 
+            <!-- Spring Boot Actuator displays build-related information
               if a META-INF/build-info.properties file is present -->
             <goals>
               <goal>build-info</goal>
@@ -158,7 +158,7 @@
         </executions>
       </plugin>
 
-      <!-- Spring Boot Actuator displays build-related information if a git.properties 
+      <!-- Spring Boot Actuator displays build-related information if a git.properties
         file is present at the classpath -->
       <plugin>
         <groupId>pl.project13.maven</groupId>