diff --git a/spring-boot-data/src/main/java/com/baeldung/fetchMode/Customer.java b/persistence-modules/hibernate5-2/src/main/java/com/baeldung/fetchMode/Customer.java
similarity index 100%
rename from spring-boot-data/src/main/java/com/baeldung/fetchMode/Customer.java
rename to persistence-modules/hibernate5-2/src/main/java/com/baeldung/fetchMode/Customer.java
diff --git a/spring-boot-data/src/main/java/com/baeldung/fetchMode/Order.java b/persistence-modules/hibernate5-2/src/main/java/com/baeldung/fetchMode/Order.java
similarity index 100%
rename from spring-boot-data/src/main/java/com/baeldung/fetchMode/Order.java
rename to persistence-modules/hibernate5-2/src/main/java/com/baeldung/fetchMode/Order.java
diff --git a/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerController.java b/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerController.java
deleted file mode 100644
index a34817fa97..0000000000
--- a/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.baeldung.fetchMode;
-
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Set;
-
-@RestController
-public class CustomerController {
-
-    private final CustomerRepository customerRepository;
-    private final OrderRepository orderRepository;
-
-    public CustomerController(CustomerRepository customerRepository, OrderRepository orderRepository) {
-        this.customerRepository = customerRepository;
-        this.orderRepository = orderRepository;
-    }
-
-    @GetMapping("test/{id}")
-    @Transactional
-    public Set<Order> getCustomerOrders(@PathVariable Long id) {
-        Customer customer = customerRepository.findById(id).get();
-        return customer.getOrders();
-    }
-
-    @GetMapping("save")
-    @Transactional
-    public Long saveNewCustomer() {
-        Customer customer = new Customer();
-        customer = customerRepository.save(customer);
-
-        Order order1 = orderRepository.save(new Order("order 1", customer));
-        Order order2 = orderRepository.save(new Order("order 2", customer));
-        Order order3 = orderRepository.save(new Order("order 3", customer));
-        Order order4 = orderRepository.save(new Order("order 4", customer));
-        Order order5 = orderRepository.save(new Order("order 5", customer));
-
-        customer.getOrders().add(order1);
-        customer.getOrders().add(order2);
-        customer.getOrders().add(order3);
-        customer.getOrders().add(order4);
-        customer.getOrders().add(order5);
-
-        Customer save = customerRepository.save(customer);
-        return save.getId();
-    }
-
-}
diff --git a/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerRepository.java b/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerRepository.java
deleted file mode 100644
index 4626e7248e..0000000000
--- a/spring-boot-data/src/main/java/com/baeldung/fetchMode/CustomerRepository.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.baeldung.fetchMode;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface CustomerRepository extends JpaRepository<Customer, Long> {
-}
diff --git a/spring-boot-data/src/main/java/com/baeldung/fetchMode/OrderRepository.java b/spring-boot-data/src/main/java/com/baeldung/fetchMode/OrderRepository.java
deleted file mode 100644
index 714f28b8c6..0000000000
--- a/spring-boot-data/src/main/java/com/baeldung/fetchMode/OrderRepository.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.baeldung.fetchMode;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface OrderRepository extends JpaRepository<Order, Long> {
-}