diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Circle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Circle.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Circle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Ring.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Ring.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Ring.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Round.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Round.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Round.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Shape.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Shape.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Shape.java
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java b/core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Triangle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/keyword/Triangle.java
rename to core-java-modules/core-java-lang-operators/src/main/java/com/baeldung/keyword/Triangle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Car.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Car.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/DiamondOperatorUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Diesel.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Diesel.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Engine.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Engine.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/diamond/Vehicle.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/diamond/Vehicle.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/keyword/test/InstanceOfUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/modulo/ModuloUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java b/core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
rename to core-java-modules/core-java-lang-operators/src/test/java/com/baeldung/ternaryoperator/TernaryOperatorUnitTest.java
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java
deleted file mode 100644
index ee17c1e8ea..0000000000
--- a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.baeldung.incrementdecrementunaryoperator;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
-public class IncrementDecrementUnaryOperatorUnitTest {
-
-    @Test
-    public void givenAnOperand_whenUsingPreIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
-        int operand = 1;
-        ++operand;
-        assertThat(operand).isEqualTo(2);
-    }
-
-    @Test
-    public void givenANumber_whenUsingPreIncrementUnaryOperatorInEvaluation_thenNumberIsIncrementedByOne() {
-        int operand = 1;
-        int number = ++operand;
-        assertThat(number).isEqualTo(2);
-    }
-
-    @Test
-    public void givenAnOperand_whenUsingPreDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
-        int operand = 1;
-        --operand;
-        assertThat(operand).isEqualTo(0);
-    }
-
-    @Test
-    public void givenANumber_whenUsingPreDecrementUnaryOperatorInEvaluation_thenNumberIsDecrementedByOne() {
-        int operand = 1;
-        int number = --operand;
-        assertThat(number).isEqualTo(0);
-    }
-
-    @Test
-    public void givenAnOperand_whenUsingPostIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
-        int operand = 1;
-        operand++;
-        assertThat(operand).isEqualTo(2);
-    }
-
-    @Test
-    public void givenANumber_whenUsingPostIncrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
-        int operand = 1;
-        int number = operand++;
-        assertThat(number).isEqualTo(1);
-    }
-
-    @Test
-    public void givenAnOperand_whenUsingPostDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
-        int operand = 1;
-        operand--;
-        assertThat(operand).isEqualTo(0);
-    }
-
-    @Test
-    public void givenANumber_whenUsingPostDecrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
-        int operand = 1;
-        int number = operand--;
-        assertThat(number).isEqualTo(1);
-    }
-}