diff --git a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java
index c3ea1d8435..bedb30fcaa 100644
--- a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
index 678d04897b..c0ca9b7e64 100644
--- a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
index 479c35d986..b4f4118527 100644
--- a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java
index c3ea1d8435..bedb30fcaa 100644
--- a/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5-reactive/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-security/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5-security/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5-security/src/test/java/com/baeldung/SpringContextTest.java
index 729790bd14..7812a5c063 100644
--- a/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5-security/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-5/src/test/java/org/baeldung/SpringContextTest.java b/spring-5/src/test/java/com/baeldung/SpringContextTest.java
similarity index 95%
rename from spring-5/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-5/src/test/java/com/baeldung/SpringContextTest.java
index 56e8697f5c..e3f67def90 100644
--- a/spring-5/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-5/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java b/spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java
similarity index 89%
rename from spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java
index 1c098a56ab..14e7de2095 100644
--- a/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-apache-camel/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;
 
diff --git a/spring-batch/repository.sqlite b/spring-batch/repository.sqlite
index 4456ef63cc..2b549352ec 100644
Binary files a/spring-batch/repository.sqlite and b/spring-batch/repository.sqlite differ
diff --git a/spring-batch/src/main/java/org/baeldung/batch/App.java b/spring-batch/src/main/java/com/baeldung/batch/App.java
similarity index 98%
rename from spring-batch/src/main/java/org/baeldung/batch/App.java
rename to spring-batch/src/main/java/com/baeldung/batch/App.java
index 764ef72a35..0f888a77b3 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/App.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/App.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch;
+package com.baeldung.batch;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java
rename to spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
index 07dd65bcfd..e1c52e1582 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
@@ -1,12 +1,12 @@
-package org.baeldung.batch;
+package com.baeldung.batch;
 
-import org.baeldung.batch.model.Transaction;
-import org.baeldung.batch.service.CustomItemProcessor;
-import org.baeldung.batch.service.CustomSkipPolicy;
-import org.baeldung.batch.service.MissingUsernameException;
-import org.baeldung.batch.service.NegativeAmountException;
-import org.baeldung.batch.service.RecordFieldSetMapper;
-import org.baeldung.batch.service.SkippingItemProcessor;
+import com.baeldung.batch.model.Transaction;
+import com.baeldung.batch.service.CustomItemProcessor;
+import com.baeldung.batch.service.CustomSkipPolicy;
+import com.baeldung.batch.service.MissingUsernameException;
+import com.baeldung.batch.service.NegativeAmountException;
+import com.baeldung.batch.service.RecordFieldSetMapper;
+import com.baeldung.batch.service.SkippingItemProcessor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchRetryConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
similarity index 95%
rename from spring-batch/src/main/java/org/baeldung/batch/SpringBatchRetryConfig.java
rename to spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
index 56088f194b..a329df3016 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/SpringBatchRetryConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
@@ -1,12 +1,12 @@
-package org.baeldung.batch;
+package com.baeldung.batch;
 
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.baeldung.batch.model.Transaction;
-import org.baeldung.batch.service.RecordFieldSetMapper;
-import org.baeldung.batch.service.RetryItemProcessor;
+import com.baeldung.batch.model.Transaction;
+import com.baeldung.batch.service.RecordFieldSetMapper;
+import com.baeldung.batch.service.RetryItemProcessor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/SpringConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java
similarity index 99%
rename from spring-batch/src/main/java/org/baeldung/batch/SpringConfig.java
rename to spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java
index 35abcb2d16..73a07482ce 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/SpringConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch;
+package com.baeldung.batch;
 
 import java.net.MalformedURLException;
 
diff --git a/spring-batch/src/main/java/org/baeldung/batch/model/Transaction.java b/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
similarity index 94%
rename from spring-batch/src/main/java/org/baeldung/batch/model/Transaction.java
rename to spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
index 8ed1d29e3b..ffb6d59a79 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/model/Transaction.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
@@ -1,6 +1,6 @@
-package org.baeldung.batch.model;
+package com.baeldung.batch.model;
 
-import org.baeldung.batch.service.adapter.LocalDateTimeAdapter;
+import com.baeldung.batch.service.adapter.LocalDateTimeAdapter;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
similarity index 98%
rename from spring-batch/src/main/java/org/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
rename to spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
index 667e013c35..4fade76ffc 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.baeldung.batch.partitioner;
+package com.baeldung.batch.partitioner;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionConfig.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
similarity index 98%
rename from spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
rename to spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
index ad3aee4a2e..b08c95af53 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
@@ -1,7 +1,7 @@
-package org.baeldung.batch.partitioner;
+package com.baeldung.batch.partitioner;
 
-import org.baeldung.batch.model.Transaction;
-import org.baeldung.batch.service.RecordFieldSetMapper;
+import com.baeldung.batch.model.Transaction;
+import com.baeldung.batch.service.RecordFieldSetMapper;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
rename to spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
index f456135058..e755e21ca9 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch.partitioner;
+package com.baeldung.batch.partitioner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/CustomItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/CustomItemProcessor.java
similarity index 77%
rename from spring-batch/src/main/java/org/baeldung/batch/service/CustomItemProcessor.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/CustomItemProcessor.java
index 8ca7892fec..5c5f78f861 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/CustomItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/CustomItemProcessor.java
@@ -1,6 +1,6 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
-import org.baeldung.batch.model.Transaction;
+import com.baeldung.batch.model.Transaction;
 import org.springframework.batch.item.ItemProcessor;
 
 public class CustomItemProcessor implements ItemProcessor<Transaction, Transaction> {
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
index a156a65b6e..25401de022 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/CustomSkipPolicy.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
 import org.springframework.batch.core.step.skip.SkipLimitExceededException;
 import org.springframework.batch.core.step.skip.SkipPolicy;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java b/spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java
similarity index 65%
rename from spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java
index 2cf8f4d334..b12daa17cc 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/MissingUsernameException.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/MissingUsernameException.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
 public class MissingUsernameException extends RuntimeException {
 }
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java b/spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java
similarity index 87%
rename from spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java
index c9c05be671..ee46574f87 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/NegativeAmountException.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/NegativeAmountException.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
 public class NegativeAmountException extends RuntimeException {
 
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
similarity index 93%
rename from spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
index e61c54193a..09478e9a30 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/RecordFieldSetMapper.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
@@ -1,6 +1,6 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
-import org.baeldung.batch.model.Transaction;
+import com.baeldung.batch.model.Transaction;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.validation.BindException;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
similarity index 95%
rename from spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
index d4e82452a7..c380e2c0ab 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/RetryItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
@@ -1,10 +1,10 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
-import org.baeldung.batch.model.Transaction;
+import com.baeldung.batch.model.Transaction;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java
similarity index 88%
rename from spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java
index 307a8213e2..ee37eb6c1b 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/SkippingItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/SkippingItemProcessor.java
@@ -1,6 +1,6 @@
-package org.baeldung.batch.service;
+package com.baeldung.batch.service;
 
-import org.baeldung.batch.model.Transaction;
+import com.baeldung.batch.model.Transaction;
 import org.springframework.batch.item.ItemProcessor;
 
 public class SkippingItemProcessor implements ItemProcessor<Transaction, Transaction> {
diff --git a/spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
similarity index 93%
rename from spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
rename to spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
index 45c35b87f1..561a7335b3 100644
--- a/spring-batch/src/main/java/org/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
@@ -1,4 +1,4 @@
-package org.baeldung.batch.service.adapter;
+package com.baeldung.batch.service.adapter;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
diff --git a/spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java b/spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
similarity index 98%
rename from spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java
rename to spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
index 1beeb6b2bf..4de3e0a4b6 100644
--- a/spring-batch/src/main/java/org/baeldung/batchscheduler/SpringBatchScheduler.java
+++ b/spring-batch/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchscheduler;
+package com.baeldung.batchscheduler;
 
 import java.util.Date;
 import java.util.IdentityHashMap;
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.baeldung.batchscheduler.model.Book;
+import com.baeldung.batchscheduler.model.Book;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
diff --git a/spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java b/spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java
rename to spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java
index f992bde20e..8ee986c729 100644
--- a/spring-batch/src/main/java/org/baeldung/batchscheduler/model/Book.java
+++ b/spring-batch/src/main/java/com/baeldung/batchscheduler/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchscheduler.model;
+package com.baeldung.batchscheduler.model;
 
 public class Book {
     private int id;
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java
similarity index 97%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java
index 39bfdfbee7..04185fb1ca 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchApplication.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchtesting;
+package com.baeldung.batchtesting;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParametersBuilder;
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
index 2d891ad7da..664db3fbba 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/SpringBatchConfiguration.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
@@ -1,13 +1,13 @@
-package org.baeldung.batchtesting;
+package com.baeldung.batchtesting;
 
 import java.io.IOException;
 
-import org.baeldung.batchtesting.model.Book;
-import org.baeldung.batchtesting.model.BookDetails;
-import org.baeldung.batchtesting.model.BookRecord;
-import org.baeldung.batchtesting.service.BookDetailsItemProcessor;
-import org.baeldung.batchtesting.service.BookItemProcessor;
-import org.baeldung.batchtesting.service.BookRecordFieldSetMapper;
+import com.baeldung.batchtesting.model.Book;
+import com.baeldung.batchtesting.model.BookDetails;
+import com.baeldung.batchtesting.model.BookRecord;
+import com.baeldung.batchtesting.service.BookDetailsItemProcessor;
+import com.baeldung.batchtesting.service.BookItemProcessor;
+import com.baeldung.batchtesting.service.BookRecordFieldSetMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java
index 3ea4a29e7f..f34e6cb5f6 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/Book.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/Book.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchtesting.model;
+package com.baeldung.batchtesting.model;
 
 public class Book {
 
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java
index d9284fbc66..3e994d2c92 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookDetails.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookDetails.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchtesting.model;
+package com.baeldung.batchtesting.model;
 
 public class BookDetails {
 
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java
index 35fb40e878..d6a1692577 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/model/BookRecord.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/model/BookRecord.java
@@ -1,4 +1,4 @@
-package org.baeldung.batchtesting.model;
+package com.baeldung.batchtesting.model;
 
 public class BookRecord {
 
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
similarity index 83%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
index f3800fee51..514a383108 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookDetailsItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
@@ -1,7 +1,7 @@
-package org.baeldung.batchtesting.service;
+package com.baeldung.batchtesting.service;
 
-import org.baeldung.batchtesting.model.BookDetails;
-import org.baeldung.batchtesting.model.BookRecord;
+import com.baeldung.batchtesting.model.BookDetails;
+import com.baeldung.batchtesting.model.BookRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.ItemProcessor;
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
similarity index 79%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
index 69e72ba1d3..84e850fe71 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
@@ -1,7 +1,7 @@
-package org.baeldung.batchtesting.service;
+package com.baeldung.batchtesting.service;
 
-import org.baeldung.batchtesting.model.Book;
-import org.baeldung.batchtesting.model.BookRecord;
+import com.baeldung.batchtesting.model.Book;
+import com.baeldung.batchtesting.model.BookRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.ItemProcessor;
diff --git a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
similarity index 89%
rename from spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
rename to spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
index cfc36fed7a..d9e8ee1158 100644
--- a/spring-batch/src/main/java/org/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
@@ -1,6 +1,6 @@
-package org.baeldung.batchtesting.service;
+package com.baeldung.batchtesting.service;
 
-import org.baeldung.batchtesting.model.BookRecord;
+import com.baeldung.batchtesting.model.BookRecord;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.validation.BindException;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java
index 5b6cd9add3..87d0bdc3fb 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineProcessor.java
@@ -1,6 +1,6 @@
-package org.baeldung.taskletsvschunks.chunks;
+package com.baeldung.taskletsvschunks.chunks;
 
-import org.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.model.Line;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
similarity index 87%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
index 5f6b6de218..6ffa730c19 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LineReader.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
@@ -1,7 +1,7 @@
-package org.baeldung.taskletsvschunks.chunks;
+package com.baeldung.taskletsvschunks.chunks;
 
-import org.baeldung.taskletsvschunks.model.Line;
-import org.baeldung.taskletsvschunks.utils.FileUtils;
+import com.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
similarity index 87%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
index 66f9103a56..9f292b24b9 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/chunks/LinesWriter.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
@@ -1,7 +1,7 @@
-package org.baeldung.taskletsvschunks.chunks;
+package com.baeldung.taskletsvschunks.chunks;
 
-import org.baeldung.taskletsvschunks.model.Line;
-import org.baeldung.taskletsvschunks.utils.FileUtils;
+import com.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
similarity index 91%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
index 601ffb7f27..57288fb312 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/ChunksConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
@@ -1,9 +1,9 @@
-package org.baeldung.taskletsvschunks.config;
+package com.baeldung.taskletsvschunks.config;
 
-import org.baeldung.taskletsvschunks.chunks.LineProcessor;
-import org.baeldung.taskletsvschunks.chunks.LineReader;
-import org.baeldung.taskletsvschunks.chunks.LinesWriter;
-import org.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.chunks.LineProcessor;
+import com.baeldung.taskletsvschunks.chunks.LineReader;
+import com.baeldung.taskletsvschunks.chunks.LinesWriter;
+import com.baeldung.taskletsvschunks.model.Line;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
similarity index 92%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
index b9d06d2639..e7157ac520 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/config/TaskletsConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
@@ -1,8 +1,8 @@
-package org.baeldung.taskletsvschunks.config;
+package com.baeldung.taskletsvschunks.config;
 
-import org.baeldung.taskletsvschunks.tasklets.LinesProcessor;
-import org.baeldung.taskletsvschunks.tasklets.LinesReader;
-import org.baeldung.taskletsvschunks.tasklets.LinesWriter;
+import com.baeldung.taskletsvschunks.tasklets.LinesProcessor;
+import com.baeldung.taskletsvschunks.tasklets.LinesReader;
+import com.baeldung.taskletsvschunks.tasklets.LinesWriter;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
index fee6fd31a6..2d7d3ff63f 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/model/Line.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
@@ -1,4 +1,4 @@
-package org.baeldung.taskletsvschunks.model;
+package com.baeldung.taskletsvschunks.model;
 
 import java.io.Serializable;
 import java.time.LocalDate;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java
similarity index 94%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java
index ba7a3088d5..8b84c39174 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesProcessor.java
@@ -1,6 +1,6 @@
-package org.baeldung.taskletsvschunks.tasklets;
+package com.baeldung.taskletsvschunks.tasklets;
 
-import org.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.model.Line;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
similarity index 91%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
index 9905ee8f8a..b1f58be4a4 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesReader.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
@@ -1,7 +1,7 @@
-package org.baeldung.taskletsvschunks.tasklets;
+package com.baeldung.taskletsvschunks.tasklets;
 
-import org.baeldung.taskletsvschunks.model.Line;
-import org.baeldung.taskletsvschunks.utils.FileUtils;
+import com.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java
similarity index 91%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java
index 937288a890..76128b7841 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/tasklets/LinesWriter.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesWriter.java
@@ -1,7 +1,7 @@
-package org.baeldung.taskletsvschunks.tasklets;
+package com.baeldung.taskletsvschunks.tasklets;
 
-import org.baeldung.taskletsvschunks.model.Line;
-import org.baeldung.taskletsvschunks.utils.FileUtils;
+import com.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
diff --git a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java
similarity index 96%
rename from spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java
rename to spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java
index df36d5c756..fde3b1fa9d 100644
--- a/spring-batch/src/main/java/org/baeldung/taskletsvschunks/utils/FileUtils.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/utils/FileUtils.java
@@ -1,8 +1,8 @@
-package org.baeldung.taskletsvschunks.utils;
+package com.baeldung.taskletsvschunks.utils;
 
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
-import org.baeldung.taskletsvschunks.model.Line;
+import com.baeldung.taskletsvschunks.model.Line;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/spring-batch/src/main/resources/logback.xml b/spring-batch/src/main/resources/logback.xml
index 9a622ceb65..55bbeba870 100644
--- a/spring-batch/src/main/resources/logback.xml
+++ b/spring-batch/src/main/resources/logback.xml
@@ -8,15 +8,15 @@
         </layout>
     </appender>
 
-    <logger name="org.baeldung.taskletsvschunks" level="debug" additivity="false">
+    <logger name="com.baeldung.taskletsvschunks" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
     
-    <logger name="org.baeldung.batchscheduler" level="debug" additivity="false">
+    <logger name="com.baeldung.batchscheduler" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
     
-    <logger name="org.baeldung.batchtesting" level="debug" additivity="false">
+    <logger name="com.baeldung.batchtesting" level="debug" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
 
diff --git a/spring-batch/src/main/resources/spring-batch-intro.xml b/spring-batch/src/main/resources/spring-batch-intro.xml
index 908b8aa2e1..2a7c1e7c4a 100644
--- a/spring-batch/src/main/resources/spring-batch-intro.xml
+++ b/spring-batch/src/main/resources/spring-batch-intro.xml
@@ -22,14 +22,14 @@
                 </property>
                 <property name="fieldSetMapper">
                     <bean
-                        class="org.baeldung.batch.service.RecordFieldSetMapper" />
+                        class="com.baeldung.batch.service.RecordFieldSetMapper" />
                 </property>
             </bean>
         </property>
         <property name="linesToSkip" value="1" />
     </bean>
 
-    <bean id="itemProcessor" class="org.baeldung.batch.service.CustomItemProcessor" />
+    <bean id="itemProcessor" class="com.baeldung.batch.service.CustomItemProcessor" />
 
     <bean id="itemWriter" class="org.springframework.batch.item.xml.StaxEventItemWriter">
         <property name="resource" value="file:xml/output.xml" />
@@ -40,7 +40,7 @@
     <bean id="recordMarshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
         <property name="classesToBeBound">
             <list>
-                <value>org.baeldung.batch.model.Transaction</value>
+                <value>com.baeldung.batch.model.Transaction</value>
             </list>
         </property>
     </bean>
diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java b/spring-batch/src/test/java/com/baeldung/SpringContextTest.java
similarity index 73%
rename from spring-batch/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-batch/src/test/java/com/baeldung/SpringContextTest.java
index 1a4f923a1e..b82bb35daf 100644
--- a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-batch/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package com.baeldung;
 
-import org.baeldung.batch.App;
+import com.baeldung.batch.App;
 import org.junit.Test;
 
 public class SpringContextTest {
diff --git a/spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
similarity index 98%
rename from spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
index 293c97ac5d..df9154a765 100644
--- a/spring-batch/src/test/java/org/baeldung/batch/SpringBatchRetryIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
@@ -1,5 +1,6 @@
-package org.baeldung.batch;
+package com.baeldung.batch;
 
+import com.baeldung.batch.SpringBatchRetryConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.entity.StringEntity;
diff --git a/spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
similarity index 96%
rename from spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
index 8927421ac5..81877fbc39 100644
--- a/spring-batch/src/test/java/org/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
@@ -1,5 +1,6 @@
-package org.baeldung.batchscheduler;
+package com.baeldung.batchscheduler;
 
+import com.baeldung.batchscheduler.SpringBatchScheduler;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
similarity index 98%
rename from spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
index d66da89ba4..333c69684e 100644
--- a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
@@ -1,10 +1,11 @@
-package org.baeldung.batchtesting;
+package com.baeldung.batchtesting;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
 
+import com.baeldung.batchtesting.SpringBatchConfiguration;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
similarity index 95%
rename from spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
index f7b888f0f9..4655117b85 100644
--- a/spring-batch/src/test/java/org/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
@@ -1,12 +1,13 @@
-package org.baeldung.batchtesting;
+package com.baeldung.batchtesting;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 
-import org.baeldung.batchtesting.model.Book;
-import org.baeldung.batchtesting.model.BookRecord;
+import com.baeldung.batchtesting.SpringBatchConfiguration;
+import com.baeldung.batchtesting.model.Book;
+import com.baeldung.batchtesting.model.BookRecord;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
similarity index 89%
rename from spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
index eaf73e4a4a..1132e4d5e2 100644
--- a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.taskletsvschunks.chunks;
+package com.baeldung.taskletsvschunks.chunks;
 
-import org.baeldung.taskletsvschunks.config.ChunksConfig;
+import com.baeldung.taskletsvschunks.config.ChunksConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
similarity index 89%
rename from spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
rename to spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
index 322b17bd55..2e1ad031aa 100644
--- a/spring-batch/src/test/java/org/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.taskletsvschunks.tasklets;
+package com.baeldung.taskletsvschunks.tasklets;
 
-import org.baeldung.taskletsvschunks.config.TaskletsConfig;
+import com.baeldung.taskletsvschunks.config.TaskletsConfig;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-batch/xml/retryOutput.xml b/spring-batch/xml/retryOutput.xml
index d30f2c4a32..c5dec44f16 100644
--- a/spring-batch/xml/retryOutput.xml
+++ b/spring-batch/xml/retryOutput.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31 00:00:00</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03 00:00:00</transactionDate><userId>9999</userId><username>john</username></transactionRecord></transactionRecord>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><transactionRecord></transactionRecord>
\ No newline at end of file
diff --git a/spring-bom/src/test/java/org/baeldung/SpringContextTest.java b/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
similarity index 90%
rename from spring-bom/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-bom/src/test/java/com/baeldung/SpringContextTest.java
index 783567cdfa..0c7da10dd6 100644
--- a/spring-bom/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung;
 
 import org.junit.Test;