diff --git a/core-java-8/src/main/java/com/baeldung/enums/values/Element1.java b/core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/enums/values/Element1.java
rename to core-java-lang/src/main/java/com/baeldung/enums/values/Element1.java
diff --git a/core-java-8/src/main/java/com/baeldung/enums/values/Element2.java b/core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/enums/values/Element2.java
rename to core-java-lang/src/main/java/com/baeldung/enums/values/Element2.java
diff --git a/core-java-8/src/main/java/com/baeldung/enums/values/Element3.java b/core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/enums/values/Element3.java
rename to core-java-lang/src/main/java/com/baeldung/enums/values/Element3.java
diff --git a/core-java-8/src/main/java/com/baeldung/enums/values/Element4.java b/core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/enums/values/Element4.java
rename to core-java-lang/src/main/java/com/baeldung/enums/values/Element4.java
diff --git a/core-java-8/src/main/java/com/baeldung/enums/values/Labeled.java b/core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/enums/values/Labeled.java
rename to core-java-lang/src/main/java/com/baeldung/enums/values/Labeled.java
diff --git a/core-java-8/src/test/java/com/baeldung/enums/values/Element1UnitTest.java b/core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
rename to core-java-lang/src/test/java/com/baeldung/enums/values/Element1UnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/enums/values/Element2UnitTest.java b/core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
rename to core-java-lang/src/test/java/com/baeldung/enums/values/Element2UnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/enums/values/Element3UnitTest.java b/core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
rename to core-java-lang/src/test/java/com/baeldung/enums/values/Element3UnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/enums/values/Element4UnitTest.java b/core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/enums/values/Element4UnitTest.java
rename to core-java-lang/src/test/java/com/baeldung/enums/values/Element4UnitTest.java