diff --git a/patterns/template-method/pom.xml b/patterns/behavioral-patterns/pom.xml
similarity index 92%
rename from patterns/template-method/pom.xml
rename to patterns/behavioral-patterns/pom.xml
index 4b863fe0a4..3c40520ce1 100644
--- a/patterns/template-method/pom.xml
+++ b/patterns/behavioral-patterns/pom.xml
@@ -1,8 +1,8 @@
 <?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>
-    <groupId>com.baeldung.templatemethod</groupId>
-    <artifactId>template-method</artifactId>
+    <groupId>com.baeldung.pattern.templatemethod</groupId>
+    <artifactId>pattern.templatemethod</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
     <parent>
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/application/Application.java
similarity index 59%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/application/Application.java
index bd383b4568..9ab34c3cd8 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/application/Application.java
@@ -1,11 +1,11 @@
-package com.baeldung.templatemethodpattern.application;
+package com.baeldung.pattern.templatemethod.application;
 
-import com.baeldung.templatemethodpattern.model.Computer;
-import com.baeldung.templatemethodpattern.model.StandardComputer;
-import com.baeldung.templatemethodpattern.model.HighEndComputer;
-import com.baeldung.templatemethodpattern.model.ComputerBuilder;
-import com.baeldung.templatemethodpattern.model.HighEndComputerBuilder;
-import com.baeldung.templatemethodpattern.model.StandardComputerBuilder;
+import com.baeldung.pattern.templatemethod.model.Computer;
+import com.baeldung.pattern.templatemethod.model.StandardComputer;
+import com.baeldung.pattern.templatemethod.model.HighEndComputer;
+import com.baeldung.pattern.templatemethod.model.ComputerBuilder;
+import com.baeldung.pattern.templatemethod.model.HighEndComputerBuilder;
+import com.baeldung.pattern.templatemethod.model.StandardComputerBuilder;
 
 public class Application {
     
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/Computer.java
similarity index 77%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/Computer.java
index 128eec59ad..1419398f62 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/Computer.java
@@ -1,9 +1,7 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Computer {
     
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/ComputerBuilder.java
similarity index 88%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/ComputerBuilder.java
index 39052f4776..515a6940f5 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/ComputerBuilder.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/ComputerBuilder.java
@@ -1,5 +1,6 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
 
+import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputer.java
similarity index 59%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputer.java
index 16d89f1ad6..0684b1b233 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputer.java
@@ -1,10 +1,11 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
 
+import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.Map;
 
 public class HighEndComputer extends Computer {
     
     public HighEndComputer(Map<String, String> computerParts) {
         super(computerParts);
-    }    
+    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputerBuilder.java
similarity index 92%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputerBuilder.java
index baa800ca8f..c992aa2bff 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputerBuilder.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputerBuilder.java
@@ -1,4 +1,4 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
 
 public class HighEndComputerBuilder extends ComputerBuilder {
 
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputer.java
similarity index 60%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputer.java
index 14d32d7b64..4e1d857016 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputer.java
@@ -1,10 +1,11 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
 
+import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.Map;
 
 public class StandardComputer extends Computer {
     
     public StandardComputer(Map<String, String> computerParts) {
         super(computerParts);
-    }    
+    }
 }
diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputerBuilder.java
similarity index 92%
rename from patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
rename to patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputerBuilder.java
index 78547dc38b..cc81dddc1b 100644
--- a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputerBuilder.java
+++ b/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputerBuilder.java
@@ -1,4 +1,4 @@
-package com.baeldung.templatemethodpattern.model;
+package com.baeldung.pattern.templatemethod.model;
  
 public class StandardComputerBuilder extends ComputerBuilder {
 
diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/templatemethod/test/TemplateMethodPatternTest.java
similarity index 89%
rename from patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
rename to patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/templatemethod/test/TemplateMethodPatternTest.java
index 1d608ff2c2..679559af9f 100644
--- a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java
+++ b/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/templatemethod/test/TemplateMethodPatternTest.java
@@ -1,10 +1,8 @@
-package com.baeldung.templatemethodpatterntest;
+package com.baeldung.pattern.templatemethod.test;
 
-import com.baeldung.templatemethodpattern.model.Computer;
-import com.baeldung.templatemethodpattern.model.HighEndComputerBuilder;
-import com.baeldung.templatemethodpattern.model.StandardComputerBuilder;
-import com.baeldung.templatemethodpattern.model.HighEndComputer;
-import com.baeldung.templatemethodpattern.model.StandardComputer;
+import com.baeldung.pattern.templatemethod.model.Computer;
+import com.baeldung.pattern.templatemethod.model.HighEndComputerBuilder;
+import com.baeldung.pattern.templatemethod.model.StandardComputerBuilder;
 import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import org.junit.BeforeClass;
@@ -82,7 +80,7 @@ public class TemplateMethodPatternTest {
         assertEquals(2, highEndComputerBuilder.getComputerParts().size());
     }
     
-    @Test
+     @Test
     public void givenAllHighEndParts_whenComputerisBuilt_thenComputerInstance() {
         assertThat(standardComputerBuilder.buildComputer(), instanceOf(Computer.class));
     }
diff --git a/patterns/pom.xml b/patterns/pom.xml
index 68e5316f64..1462952e37 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -9,7 +9,7 @@
     <modules>
         <module>front-controller</module>
         <module>intercepting-filter</module>
-        <module>template-method</module>
+        <module>behavioral-patterns</module>
     </modules>
 
     <parent>