diff --git a/guava/src/main/java/org/baeldung/guava/CustomEvent.java b/guava/src/main/java/com/baeldung/guava/CustomEvent.java
similarity index 90%
rename from guava/src/main/java/org/baeldung/guava/CustomEvent.java
rename to guava/src/main/java/com/baeldung/guava/CustomEvent.java
index 8534d7da1c..a154790374 100644
--- a/guava/src/main/java/org/baeldung/guava/CustomEvent.java
+++ b/guava/src/main/java/com/baeldung/guava/CustomEvent.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 public class CustomEvent {
     private String action;
diff --git a/guava/src/main/java/org/baeldung/guava/EventListener.java b/guava/src/main/java/com/baeldung/guava/EventListener.java
similarity index 97%
rename from guava/src/main/java/org/baeldung/guava/EventListener.java
rename to guava/src/main/java/com/baeldung/guava/EventListener.java
index 60beebeea5..7bcfbcb8e9 100644
--- a/guava/src/main/java/org/baeldung/guava/EventListener.java
+++ b/guava/src/main/java/com/baeldung/guava/EventListener.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.eventbus.DeadEvent;
 import com.google.common.eventbus.Subscribe;
diff --git a/guava/src/main/java/org/baeldung/guava/memoizer/CostlySupplier.java b/guava/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
similarity index 89%
rename from guava/src/main/java/org/baeldung/guava/memoizer/CostlySupplier.java
rename to guava/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
index 63b3fbd438..9a929a15bd 100644
--- a/guava/src/main/java/org/baeldung/guava/memoizer/CostlySupplier.java
+++ b/guava/src/main/java/com/baeldung/guava/memoizer/CostlySupplier.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava.memoizer;
+package com.baeldung.guava.memoizer;
 
 import java.math.BigInteger;
 import java.util.Random;
diff --git a/guava/src/main/java/org/baeldung/guava/memoizer/Factorial.java b/guava/src/main/java/com/baeldung/guava/memoizer/Factorial.java
similarity index 93%
rename from guava/src/main/java/org/baeldung/guava/memoizer/Factorial.java
rename to guava/src/main/java/com/baeldung/guava/memoizer/Factorial.java
index 74fcbdcc14..6497979682 100644
--- a/guava/src/main/java/org/baeldung/guava/memoizer/Factorial.java
+++ b/guava/src/main/java/com/baeldung/guava/memoizer/Factorial.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava.memoizer;
+package com.baeldung.guava.memoizer;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/guava/src/main/java/org/baeldung/guava/memoizer/FibonacciSequence.java b/guava/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
similarity index 90%
rename from guava/src/main/java/org/baeldung/guava/memoizer/FibonacciSequence.java
rename to guava/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
index 0c70f08c23..d0462fb001 100644
--- a/guava/src/main/java/org/baeldung/guava/memoizer/FibonacciSequence.java
+++ b/guava/src/main/java/com/baeldung/guava/memoizer/FibonacciSequence.java
@@ -1,11 +1,10 @@
-package org.baeldung.guava.memoizer;
+package com.baeldung.guava.memoizer;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 
 import java.math.BigInteger;
-import java.util.concurrent.TimeUnit;
 
 public class FibonacciSequence {
 
diff --git a/guava/src/test/java/org/baeldung/guava/BloomFilterUnitTest.java b/guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java
similarity index 98%
rename from guava/src/test/java/org/baeldung/guava/BloomFilterUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java
index ff3031a0cb..c11bf27256 100644
--- a/guava/src/test/java/org/baeldung/guava/BloomFilterUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/BloomFilterUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 
 import com.google.common.hash.BloomFilter;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java
index f5afe20fc2..cca42a688f 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaBigIntegerMathUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java
similarity index 98%
rename from guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java
index e27171bb84..bf9747ec18 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaCacheLoaderUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java
index 49ce6b1a09..8aa56c7c52 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaCacheUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java
index b39770e2e7..9c78fb36fa 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaDoubleMathUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.junit.Assert.*;
 
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java
similarity index 97%
rename from guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java
index 1bc62af300..bb9d26fcce 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaEventBusUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.eventbus.EventBus;
 import org.junit.After;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
index c09ae696b3..b54a7c951a 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaFunctionalExamplesUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java
index 9270212929..547f423396 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaIntMathUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.junit.Assert.*;
 
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java
index 680f405149..33c28d4594 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaLongMathUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.junit.Assert.*;
 
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java
index 1e1f806628..fce0fec13b 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaMathUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.*;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMemoizerUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java
similarity index 94%
rename from guava/src/test/java/org/baeldung/guava/GuavaMemoizerUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java
index 8c37ecf07c..9bafb7ad3f 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaMemoizerUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaMemoizerUnitTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Suppliers;
-import org.baeldung.guava.memoizer.CostlySupplier;
-import org.baeldung.guava.memoizer.Factorial;
-import org.baeldung.guava.memoizer.FibonacciSequence;
+import com.baeldung.guava.memoizer.CostlySupplier;
+import com.baeldung.guava.memoizer.Factorial;
+import com.baeldung.guava.memoizer.FibonacciSequence;
 import org.junit.Test;
 
 import java.math.BigInteger;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java
index 6bf9e5c7a2..fe3be9abf0 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaPreConditionsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import java.util.Arrays;
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java b/guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java
similarity index 99%
rename from guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java
index f2d1c08ae9..36df241711 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/GuavaReflectionUtilsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 
 import com.google.common.collect.Lists;
diff --git a/guava/src/test/java/org/baeldung/guava/RateLimiterLongRunningUnitTest.java b/guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java
similarity index 98%
rename from guava/src/test/java/org/baeldung/guava/RateLimiterLongRunningUnitTest.java
rename to guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java
index 914de01a6d..7372e9f6e9 100644
--- a/guava/src/test/java/org/baeldung/guava/RateLimiterLongRunningUnitTest.java
+++ b/guava/src/test/java/com/baeldung/guava/RateLimiterLongRunningUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 
 import com.google.common.util.concurrent.RateLimiter;