diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml
index 3e4c10e515..4adc3ee6d1 100644
--- a/core-java-modules/core-java-16/pom.xml
+++ b/core-java-modules/core-java-16/pom.xml
@@ -1,64 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>core-java-16</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
-	<name>core-java-16</name>
-	<packaging>jar</packaging>
-	<url>http://maven.apache.org</url>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-16</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-16</name>
+    <packaging>jar</packaging>
+    <url>http://maven.apache.org</url>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
-	</parent>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<release>${maven.compiler.release}</release>
-					<compilerArgs>--enable-preview</compilerArgs>
-					<source>${maven.compiler.source.version}</source>
-					<target>${maven.compiler.target.version}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${surefire.plugin.version}</version>
-				<configuration>
-					<argLine>--enable-preview</argLine>
-					<forkCount>1</forkCount>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-api</artifactId>
-						<version>${surefire.plugin.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${maven.compiler.release}</release>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                    <source>${maven.compiler.source.version}</source>
+                    <target>${maven.compiler.target.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.plugin.version}</version>
+                <configuration>
+                    <argLine>--enable-preview</argLine>
+                    <forkCount>1</forkCount>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-api</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 
-	<properties>
-		<maven.compiler.source.version>16</maven.compiler.source.version>
-		<maven.compiler.target.version>16</maven.compiler.target.version>
-		<maven.compiler.release>16</maven.compiler.release>
-		<surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
-	</properties>
+    <properties>
+        <maven.compiler.source.version>16</maven.compiler.source.version>
+        <maven.compiler.target.version>16</maven.compiler.target.version>
+        <maven.compiler.release>16</maven.compiler.release>
+        <surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
+    </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/enumallt/DinosaurEnum.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/enumallt/DinosaurEnum.java
deleted file mode 100644
index a50f79947c..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/enumallt/DinosaurEnum.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baeldung.instanceofalternative.enumallt;
-
-public enum DinosaurEnum {
-    Anatotitan {
-        @Override
-        public String move() {
-            return "running";
-        }
-    },
-    Euraptor {
-        @Override
-        public String move() {
-            return "flying";
-        }
-    };
-
-    public abstract String move();
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Anatotitan.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Anatotitan.java
deleted file mode 100644
index ce59b58ad7..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Anatotitan.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.instanceofalternative.model;
-
-public class Anatotitan extends Dinosaur {
-    // polymorphism
-    @Override
-    public String move() {
-        return "running";
-    }
-
-    // non-polymorphism
-    public String run() {
-        return "running";
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Dinosaur.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Dinosaur.java
deleted file mode 100644
index 38055054f5..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Dinosaur.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.baeldung.instanceofalternative.model;
-
-public class Dinosaur {
-
-    public String move() {
-        return "default movement";
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Euraptor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Euraptor.java
deleted file mode 100644
index 1de5257a0d..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/model/Euraptor.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.instanceofalternative.model;
-
-public class Euraptor extends Dinosaur {
-    // polymorphism
-    @Override
-    public String move() {
-        return "flying";
-    }
-
-    // non-polymorphism
-    public String flies() {
-        return "flying";
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Anatotitan.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Anatotitan.java
deleted file mode 100644
index 84d93e7350..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Anatotitan.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.instanceofalternative.visitorspattern;
-
-public class Anatotitan implements Dino {
-
-    String run() {
-        return "running";
-    }
-
-    @Override
-    public String move(Visitor dinobehave) {
-        return dinobehave.visit(this);
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Dino.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Dino.java
deleted file mode 100644
index ef33baf2a4..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Dino.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.baeldung.instanceofalternative.visitorspattern;
-
-public interface Dino {
-
-    String move(Visitor dinoMove);
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/DinoVisitorImpl.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/DinoVisitorImpl.java
deleted file mode 100644
index 6fd71374fa..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/DinoVisitorImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.instanceofalternative.visitorspattern;
-
-public class DinoVisitorImpl implements Visitor {
-
-    @Override
-    public String visit(Anatotitan anatotitan) {
-        return anatotitan.run();
-    }
-
-    @Override
-    public String visit(Euraptor euraptor) {
-        return euraptor.flies();
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Euraptor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Euraptor.java
deleted file mode 100644
index fdce1e6c0b..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Euraptor.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.instanceofalternative.visitorspattern;
-
-public class Euraptor implements Dino {
-
-    String flies() {
-        return "flying";
-    }
-
-    @Override
-    public String move(Visitor dinobehave) {
-        return dinobehave.visit(this);
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Visitor.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Visitor.java
deleted file mode 100644
index 75fada3533..0000000000
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/instanceofalternative/visitorspattern/Visitor.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.baeldung.instanceofalternative.visitorspattern;
-
-public interface Visitor {
-
-    String visit(Anatotitan anatotitan);
-
-    String visit(Euraptor euraptor);
-
-}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/EnumUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/EnumUnitTest.java
deleted file mode 100644
index 73faa2a1ef..0000000000
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/EnumUnitTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.instanceoftest;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.baeldung.instanceofalternative.enumallt.*;
-
-public class EnumUnitTest {
-    @Test
-    public void givenADinosaurSpecie_whenUsingEnum_thenGetMovementOfEuraptor() {
-
-        assertEquals("flying", moveDinosaurUsingEnum(DinosaurEnum.Euraptor));
-    }
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingEnum_thenGetMovementOfAnatotitan() {
-        assertEquals("running", moveDinosaurUsingEnum(DinosaurEnum.Anatotitan));
-    }
-
-    public static String moveDinosaurUsingEnum(DinosaurEnum dinosaurenum) {
-        return dinosaurenum.move();
-
-    }
-
-}
\ No newline at end of file
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/ExampleSetupUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/ExampleSetupUnitTest.java
deleted file mode 100644
index c42f77849b..0000000000
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/ExampleSetupUnitTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.baeldung.instanceoftest;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.baeldung.instanceofalternative.model.*;
-
-public class ExampleSetupUnitTest {
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingInstancof_thenGetMovementOfAnatotitan() {
-
-        assertEquals("running", moveDinosaurUsingInstanceof(new Anatotitan()));
-    }
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingInstanceof_thenGetMovementOfEuraptor() {
-        assertEquals("flying", moveDinosaurUsingInstanceof(new Euraptor()));
-    }
-
-    public static String moveDinosaurUsingInstanceof(Dinosaur dinosaur) {
-
-        if (dinosaur instanceof Anatotitan) {
-
-            Anatotitan anatotitan = (Anatotitan) dinosaur;
-            return anatotitan.run();
-        } else if (dinosaur instanceof Euraptor) {
-            Euraptor euraptor = (Euraptor) dinosaur;
-            return euraptor.flies();
-        }
-        return "";
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/GetClassUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/GetClassUnitTest.java
deleted file mode 100644
index 6a4886c8a3..0000000000
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/GetClassUnitTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.baeldung.instanceoftest;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import com.baeldung.instanceofalternative.model.*;
-
-public class GetClassUnitTest {
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingGetClass_thenGetMovementOfAnatotitan() {
-
-        assertEquals("running", moveDinosaurUsingGetClass(new Anatotitan()));
-    }
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingGetClass_thenGetMovementOfEuraptor() {
-        assertEquals("flying", moveDinosaurUsingGetClass(new Euraptor()));
-    }
-
-    public static String moveDinosaurUsingGetClass(Dinosaur dinosaur) {
-
-        if (dinosaur.getClass()
-            .equals(Anatotitan.class)) {
-
-            Anatotitan anatotitan = (Anatotitan) dinosaur;
-            return anatotitan.run();
-        } else if (dinosaur.getClass()
-            .equals(Euraptor.class)) {
-            Euraptor euraptor = (Euraptor) dinosaur;
-            return euraptor.flies();
-        }
-        return "";
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/PolymorphismUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/PolymorphismUnitTest.java
deleted file mode 100644
index 960ed34c82..0000000000
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/PolymorphismUnitTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.baeldung.instanceoftest;
-
-import static org.junit.Assert.*;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.baeldung.instanceofalternative.model.*;
-
-public class PolymorphismUnitTest {
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingPolymorphism_thenGetMovementOfAnatotitan() {
-
-        assertEquals("running", moveDinosaurUsingPolymorphism(new Anatotitan()));
-    }
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingPolymorphism_thenGetMovementOfEuraptor() {
-        assertEquals("flying", moveDinosaurUsingPolymorphism(new Euraptor()));
-    }
-
-    public static String moveDinosaurUsingPolymorphism(Dinosaur dinosaur) {
-        return dinosaur.move();
-    }
-
-}
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/VisitorsPatternUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/VisitorsPatternUnitTest.java
deleted file mode 100644
index 287f7df798..0000000000
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/instanceoftest/VisitorsPatternUnitTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.baeldung.instanceoftest;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import com.baeldung.instanceofalternative.visitorspattern.*;
-
-public class VisitorsPatternUnitTest {
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingVisitorPattern_thenGetMovementOfAnatotitan() {
-
-        assertEquals("running", moveDinosaurUsingVisitorPattern((Dino) new Anatotitan()));
-    }
-
-    @Test
-    public void givenADinosaurSpecie_whenUsingVisitorPattern_thenGetMovementOfEuraptor() {
-
-        assertEquals("flying", moveDinosaurUsingVisitorPattern((Dino) new Euraptor()));
-    }
-
-    public static String moveDinosaurUsingVisitorPattern(Dino dinosaur) {
-        Visitor visitor = new DinoVisitorImpl();
-
-        return dinosaur.move(visitor);
-    }
-
-}