diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java
similarity index 90%
rename from cdiexample/src/main/java/com/baeldung/interceptor/Audited.java
rename to cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java
index 4065450b09..459a1c35da 100644
--- a/cdiexample/src/main/java/com/baeldung/interceptor/Audited.java
+++ b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/Audited.java
@@ -1,4 +1,4 @@
-package com.baeldung.interceptor;
+package com.baeldung.cdi.interceptor;
 
 import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
diff --git a/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java
similarity index 94%
rename from cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java
rename to cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java
index 6501c60ad0..53a3af7091 100644
--- a/cdiexample/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java
+++ b/cdiexample/src/main/java/com/baeldung/cdi/interceptor/AuditedInterceptor.java
@@ -1,4 +1,4 @@
-package com.baeldung.interceptor;
+package com.baeldung.cdi.interceptor;
 
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
diff --git a/cdiexample/src/main/java/com/baeldung/service/SuperService.java b/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java
similarity index 69%
rename from cdiexample/src/main/java/com/baeldung/service/SuperService.java
rename to cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java
index 5309c80b10..cbf22fd803 100644
--- a/cdiexample/src/main/java/com/baeldung/service/SuperService.java
+++ b/cdiexample/src/main/java/com/baeldung/cdi/service/SuperService.java
@@ -1,6 +1,6 @@
-package com.baeldung.service;
+package com.baeldung.cdi.service;
 
-import com.baeldung.interceptor.Audited;
+import com.baeldung.cdi.interceptor.Audited;
 
 public class SuperService {
     @Audited
diff --git a/cdiexample/src/main/resources/META-INF/beans.xml b/cdiexample/src/main/resources/META-INF/beans.xml
index d41b35e7d9..0a68bbf29d 100644
--- a/cdiexample/src/main/resources/META-INF/beans.xml
+++ b/cdiexample/src/main/resources/META-INF/beans.xml
@@ -3,6 +3,6 @@
        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
       http://java.sun.com/xml/ns/javaee/beans_1_2.xsd">
     <interceptors>
-        <class>com.baeldung.interceptor.AuditedInterceptor</class>
+        <class>com.baeldung.cdi.interceptor.AuditedInterceptor</class>
     </interceptors>
 </beans>
\ No newline at end of file
diff --git a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java
index 1ed0d99748..d32890869c 100644
--- a/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java
+++ b/cdiexample/src/test/java/com/baeldung/test/TestInterceptor.java
@@ -1,6 +1,6 @@
 package com.baeldung.test;
 
-import com.baeldung.service.SuperService;
+import com.baeldung.cdi.service.SuperService;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
 import org.junit.Assert;