diff --git a/lagom/build.sbt b/lagom/build.sbt
index 06927e3301..19aeccbd07 100644
--- a/lagom/build.sbt
+++ b/lagom/build.sbt
@@ -1,4 +1,4 @@
-organization in ThisBuild := "org.baeldung"
+organization in ThisBuild := "com.baeldung"
 
 // the Scala version that will be used for cross-compiled libraries
 scalaVersion in ThisBuild := "2.11.8"
diff --git a/lagom/greeting-api/src/main/java/org/baeldung/lagom/helloworld/greeting/api/GreetingService.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/api/GreetingService.java
similarity index 93%
rename from lagom/greeting-api/src/main/java/org/baeldung/lagom/helloworld/greeting/api/GreetingService.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/api/GreetingService.java
index 93567f0185..e212c45437 100644
--- a/lagom/greeting-api/src/main/java/org/baeldung/lagom/helloworld/greeting/api/GreetingService.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/api/GreetingService.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.greeting.api;
+package com.baeldung.lagom.helloworld.greeting.api;
 
 import static com.lightbend.lagom.javadsl.api.Service.named;
 import static com.lightbend.lagom.javadsl.api.Service.restCall;
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java
similarity index 94%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java
index be9e713ec9..30d3930b75 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingCommand.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java
similarity index 85%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java
index 91fc74039d..125cf4bf38 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEntity.java
@@ -1,9 +1,9 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
 import java.util.Optional;
 
-import org.baeldung.lagom.helloworld.greeting.impl.GreetingCommand.ReceivedGreetingCommand;
-import org.baeldung.lagom.helloworld.greeting.impl.GreetingEvent.ReceivedGreetingEvent;
+import com.baeldung.lagom.helloworld.greeting.impl.GreetingCommand.ReceivedGreetingCommand;
+import com.baeldung.lagom.helloworld.greeting.impl.GreetingEvent.ReceivedGreetingEvent;
 
 import com.lightbend.lagom.javadsl.persistence.PersistentEntity;
 
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java
similarity index 90%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java
index e454f6cd1b..8800177add 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.lightbend.lagom.serialization.Jsonable;
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java
similarity index 85%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java
index c28687291e..0c79b0d468 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceImpl.java
@@ -1,12 +1,12 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import org.baeldung.lagom.helloworld.greeting.api.GreetingService;
-import org.baeldung.lagom.helloworld.greeting.impl.GreetingCommand.ReceivedGreetingCommand;
-import org.baeldung.lagom.helloworld.weather.api.WeatherService;
-import org.baeldung.lagom.helloworld.weather.api.WeatherStats;
+import com.baeldung.lagom.helloworld.greeting.api.GreetingService;
+import com.baeldung.lagom.helloworld.greeting.impl.GreetingCommand.ReceivedGreetingCommand;
+import com.baeldung.lagom.helloworld.weather.api.WeatherService;
+import com.baeldung.lagom.helloworld.weather.api.WeatherStats;
 
 import com.google.inject.Inject;
 import com.lightbend.lagom.javadsl.api.ServiceCall;
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java
similarity index 72%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java
index 4813e91a7c..ba5142a5e6 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingServiceModule.java
@@ -1,7 +1,7 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
-import org.baeldung.lagom.helloworld.greeting.api.GreetingService;
-import org.baeldung.lagom.helloworld.weather.api.WeatherService;
+import com.baeldung.lagom.helloworld.greeting.api.GreetingService;
+import com.baeldung.lagom.helloworld.weather.api.WeatherService;
 
 import com.google.inject.AbstractModule;
 import com.lightbend.lagom.javadsl.server.ServiceGuiceSupport;
diff --git a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingState.java b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingState.java
similarity index 89%
rename from lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingState.java
rename to lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingState.java
index 125795601e..023c0510ae 100644
--- a/lagom/greeting-impl/src/main/java/org/baeldung/lagom/helloworld/greeting/impl/GreetingState.java
+++ b/lagom/greeting-api/src/main/java/com/baeldung/lagom/helloworld/greeting/impl/GreetingState.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.greeting.impl;
+package com.baeldung.lagom.helloworld.greeting.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/lagom/greeting-impl/bin/application.conf b/lagom/greeting-impl/bin/application.conf
index 1e78ce4a79..3fd21ae72b 100644
--- a/lagom/greeting-impl/bin/application.conf
+++ b/lagom/greeting-impl/bin/application.conf
@@ -1 +1 @@
-play.modules.enabled += org.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
+play.modules.enabled += com.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
diff --git a/lagom/greeting-impl/bin/classes/application.conf b/lagom/greeting-impl/bin/classes/application.conf
index 1e78ce4a79..3fd21ae72b 100644
--- a/lagom/greeting-impl/bin/classes/application.conf
+++ b/lagom/greeting-impl/bin/classes/application.conf
@@ -1 +1 @@
-play.modules.enabled += org.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
+play.modules.enabled += com.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
diff --git a/lagom/greeting-impl/src/main/resources/application.conf b/lagom/greeting-impl/src/main/resources/application.conf
index 1e78ce4a79..3fd21ae72b 100644
--- a/lagom/greeting-impl/src/main/resources/application.conf
+++ b/lagom/greeting-impl/src/main/resources/application.conf
@@ -1 +1 @@
-play.modules.enabled += org.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
+play.modules.enabled += com.baeldung.lagom.helloworld.greeting.impl.GreetingServiceModule
\ No newline at end of file
diff --git a/lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherService.java b/lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherService.java
similarity index 93%
rename from lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherService.java
rename to lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherService.java
index 888109322b..a0749222eb 100644
--- a/lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherService.java
+++ b/lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherService.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.weather.api;
+package com.baeldung.lagom.helloworld.weather.api;
 
 import static com.lightbend.lagom.javadsl.api.Service.named;
 import static com.lightbend.lagom.javadsl.api.Service.*;
diff --git a/lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherStats.java b/lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherStats.java
similarity index 93%
rename from lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherStats.java
rename to lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherStats.java
index 23530a297d..aa04c5ad86 100644
--- a/lagom/weather-api/src/main/java/org/baeldung/lagom/helloworld/weather/api/WeatherStats.java
+++ b/lagom/weather-api/src/main/java/com/baeldung/lagom/helloworld/weather/api/WeatherStats.java
@@ -1,4 +1,4 @@
-package org.baeldung.lagom.helloworld.weather.api;
+package com.baeldung.lagom.helloworld.weather.api;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/lagom/weather-impl/bin/application.conf b/lagom/weather-impl/bin/application.conf
index cf6cec2115..53d2dff8f2 100644
--- a/lagom/weather-impl/bin/application.conf
+++ b/lagom/weather-impl/bin/application.conf
@@ -1 +1 @@
-play.modules.enabled += org.baeldung.lagom.helloworld.weather.impl.WeatherServiceModule
\ No newline at end of file
+play.modules.enabled += com.baeldung.lagom.helloworld.weather.impl.WeatherServiceModule
\ No newline at end of file
diff --git a/lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java b/lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java
similarity index 67%
rename from lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java
rename to lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java
index d7f97f9105..38e4b4d28f 100644
--- a/lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java
+++ b/lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceImpl.java
@@ -1,9 +1,9 @@
-package org.baeldung.lagom.helloworld.weather.impl;
+package com.baeldung.lagom.helloworld.weather.impl;
 
 import java.util.concurrent.CompletableFuture;
 
-import org.baeldung.lagom.helloworld.weather.api.WeatherService;
-import org.baeldung.lagom.helloworld.weather.api.WeatherStats;
+import com.baeldung.lagom.helloworld.weather.api.WeatherService;
+import com.baeldung.lagom.helloworld.weather.api.WeatherStats;
 
 import com.lightbend.lagom.javadsl.api.ServiceCall;
 
diff --git a/lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java b/lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java
similarity index 78%
rename from lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java
rename to lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java
index ac2834ff5c..85257ffa47 100644
--- a/lagom/weather-impl/src/main/java/org/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java
+++ b/lagom/weather-impl/src/main/java/com/baeldung/lagom/helloworld/weather/impl/WeatherServiceModule.java
@@ -1,6 +1,6 @@
-package org.baeldung.lagom.helloworld.weather.impl;
+package com.baeldung.lagom.helloworld.weather.impl;
 
-import org.baeldung.lagom.helloworld.weather.api.WeatherService;
+import com.baeldung.lagom.helloworld.weather.api.WeatherService;
 
 import com.google.inject.AbstractModule;
 import com.lightbend.lagom.javadsl.server.ServiceGuiceSupport;
diff --git a/lagom/weather-impl/src/main/resources/application.conf b/lagom/weather-impl/src/main/resources/application.conf
index cf6cec2115..53d2dff8f2 100644
--- a/lagom/weather-impl/src/main/resources/application.conf
+++ b/lagom/weather-impl/src/main/resources/application.conf
@@ -1 +1 @@
-play.modules.enabled += org.baeldung.lagom.helloworld.weather.impl.WeatherServiceModule
\ No newline at end of file
+play.modules.enabled += com.baeldung.lagom.helloworld.weather.impl.WeatherServiceModule
\ No newline at end of file