diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml
index b23e309696..9db2562fb4 100644
--- a/core-java-8/pom.xml
+++ b/core-java-8/pom.xml
@@ -28,6 +28,12 @@
             <version>4.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.10</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/core-java-8/src/main/java/com/demo/encoding/ApacheCommonsEncodeDecode.java b/core-java-8/src/test/java/org/baeldung/java8/base64/ApacheCommonsEncodeDecodeTest.java
similarity index 95%
rename from core-java-8/src/main/java/com/demo/encoding/ApacheCommonsEncodeDecode.java
rename to core-java-8/src/test/java/org/baeldung/java8/base64/ApacheCommonsEncodeDecodeTest.java
index d15b1325dc..5e16df5a12 100644
--- a/core-java-8/src/main/java/com/demo/encoding/ApacheCommonsEncodeDecode.java
+++ b/core-java-8/src/test/java/org/baeldung/java8/base64/ApacheCommonsEncodeDecodeTest.java
@@ -1,4 +1,4 @@
-package com.demo.encoding;
+package org.baeldung.java8.base64;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -9,7 +9,7 @@ import java.io.UnsupportedEncodingException;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
 
-public class ApacheCommonsEncodeDecode {
+public class ApacheCommonsEncodeDecodeTest {
 
     @Test
     public void whenStringIsEncoded() throws UnsupportedEncodingException {
diff --git a/core-java-8/src/main/java/com/demo/encoding/Java8EncodeDecode.java b/core-java-8/src/test/java/org/baeldung/java8/base64/Java8EncodeDecodeTest.java
similarity index 98%
rename from core-java-8/src/main/java/com/demo/encoding/Java8EncodeDecode.java
rename to core-java-8/src/test/java/org/baeldung/java8/base64/Java8EncodeDecodeTest.java
index 241fee6ded..ae7bf0166d 100644
--- a/core-java-8/src/main/java/com/demo/encoding/Java8EncodeDecode.java
+++ b/core-java-8/src/test/java/org/baeldung/java8/base64/Java8EncodeDecodeTest.java
@@ -1,4 +1,4 @@
-package com.demo.encoding;
+package org.baeldung.java8.base64;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -10,7 +10,7 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-public class Java8EncodeDecode {
+public class Java8EncodeDecodeTest {
 
     @Test
     public void whenStringIsEncoded() throws UnsupportedEncodingException {