diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java
deleted file mode 100644
index 897bb71f38..0000000000
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Color.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
-
-public interface Color {
- String getColor();
-}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java b/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java
deleted file mode 100644
index 8364e546b0..0000000000
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Polygon.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.baeldung.designpatterns.creational.factory;
-
-public interface Polygon {
- String getType();
-}
diff --git a/core-java/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java b/core-java/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
index 32d3051327..c3cc567eaa 100755
--- a/core-java/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
+++ b/core-java/src/main/java/com/baeldung/numberofdigits/NumberOfDigitsDriver.java
@@ -1,10 +1,12 @@
package com.baeldung.numberofdigits;
-import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+import org.apache.log4j.Logger;
public class NumberOfDigitsDriver {
private static NumberOfDigits numberOfDigits;
+ private static Logger LOG = Logger.getLogger(NumberOfDigitsDriver.class);
+
static {
numberOfDigits = new NumberOfDigits();
}
diff --git a/patterns/facade/README.md b/patterns/design-patterns/README.md
similarity index 100%
rename from patterns/facade/README.md
rename to patterns/design-patterns/README.md
diff --git a/patterns/behavioral-patterns/pom.xml b/patterns/design-patterns/pom.xml
similarity index 68%
rename from patterns/behavioral-patterns/pom.xml
rename to patterns/design-patterns/pom.xml
index 435f07aa98..87db08ab32 100644
--- a/patterns/behavioral-patterns/pom.xml
+++ b/patterns/design-patterns/pom.xml
@@ -1,12 +1,12 @@
4.0.0
- com.baeldung.pattern.templatemethod
- pattern.templatemethod
+ com.baeldung
+ design-patterns
1.0
jar
- com.baeldung.patterns
+ com.baeldung
patterns-parent
1.0.0-SNAPSHOT
..
@@ -19,7 +19,7 @@
4.12
test
-
+
org.hamcrest
hamcrest-core
1.3
@@ -31,10 +31,22 @@
3.8.0
test
+
+ log4j
+ log4j
+ ${log4j.version}
+
+
+ com.googlecode.grep4j
+ grep4j
+ ${grep4j.version}
+
UTF-8
1.8
1.8
-
+ 1.2.17
+ 1.8.7
+
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/AdapterPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/AdapterPatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
index 79f618d038..a4e10a0868 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/AdapterPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
@@ -1,6 +1,6 @@
-package com.baeldung.designpatterns.adapter;
+package com.baeldung.adapter;
-import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+import static com.baeldung.util.LogerUtil.LOG;
public class AdapterPatternDriver {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/AstonMartin.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/AstonMartin.java
similarity index 69%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/AstonMartin.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/AstonMartin.java
index 7dd83079a2..c6aa0c525a 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/AstonMartin.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/AstonMartin.java
@@ -1,8 +1,8 @@
-package com.baeldung.designpatterns.adapter;
-
-public class AstonMartin implements Movable {
- @Override
- public double getSpeed() {
- return 220;
- }
-}
+package com.baeldung.adapter;
+
+public class AstonMartin implements Movable {
+ @Override
+ public double getSpeed() {
+ return 220;
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/BugattiVeyron.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/BugattiVeyron.java
similarity index 69%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/BugattiVeyron.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/BugattiVeyron.java
index a249d64b6f..e7d47d138a 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/BugattiVeyron.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/BugattiVeyron.java
@@ -1,8 +1,8 @@
-package com.baeldung.designpatterns.adapter;
-
-public class BugattiVeyron implements Movable {
- @Override
- public double getSpeed() {
- return 268;
- }
-}
+package com.baeldung.adapter;
+
+public class BugattiVeyron implements Movable {
+ @Override
+ public double getSpeed() {
+ return 268;
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/McLaren.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/McLaren.java
similarity index 68%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/McLaren.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/McLaren.java
index c807df67db..4ca1cde856 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/McLaren.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/McLaren.java
@@ -1,8 +1,8 @@
-package com.baeldung.designpatterns.adapter;
-
-public class McLaren implements Movable {
- @Override
- public double getSpeed() {
- return 241;
- }
-}
+package com.baeldung.adapter;
+
+public class McLaren implements Movable {
+ @Override
+ public double getSpeed() {
+ return 241;
+ }
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/Movable.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/Movable.java
similarity index 61%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/Movable.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/Movable.java
index ec94e90af0..bec0bee568 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/Movable.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/Movable.java
@@ -1,6 +1,6 @@
-package com.baeldung.designpatterns.adapter;
-
-public interface Movable {
- // returns speed in MPH
- double getSpeed();
+package com.baeldung.adapter;
+
+public interface Movable {
+ // returns speed in MPH
+ double getSpeed();
}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapter.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapter.java
similarity index 66%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapter.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapter.java
index b9c7484446..8d529e7b13 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapter.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapter.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.adapter;
+package com.baeldung.adapter;
public interface MovableAdapter {
// returns speed in KMPH
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapterImpl.java b/patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapterImpl.java
rename to patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
index eb74641389..8f18cc9942 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/adapter/MovableAdapterImpl.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.adapter;
+package com.baeldung.adapter;
public class MovableAdapterImpl implements MovableAdapter {
private Movable luxuryCars;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Blue.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Blue.java
similarity index 73%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Blue.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Blue.java
index da5d29617f..022905f30d 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Blue.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Blue.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public class Blue implements Color {
@Override
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/BridgePatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
similarity index 88%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/BridgePatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
index e6a7fb41c1..31d18a2347 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/BridgePatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public class BridgePatternDriver {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Color.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Color.java
similarity index 51%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Color.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Color.java
index 05618e6d6e..9d38f407ba 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Color.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Color.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public interface Color {
String fill();
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Red.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Red.java
similarity index 73%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Red.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Red.java
index bc83199591..e7011096ce 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Red.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Red.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public class Red implements Color {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Shape.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Shape.java
similarity index 79%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Shape.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Shape.java
index 75cd43dbc8..20085cf112 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Shape.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Shape.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public abstract class Shape {
protected Color color;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Square.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Square.java
similarity index 81%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Square.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Square.java
index 7397f4bd47..21a59247d5 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Square.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Square.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public class Square extends Shape {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Triangle.java b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Triangle.java
similarity index 82%
rename from core-java/src/main/java/com/baeldung/designpatterns/bridge/Triangle.java
rename to patterns/design-patterns/src/main/java/com/baeldung/bridge/Triangle.java
index 46db66ee42..1647e7106d 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/bridge/Triangle.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/bridge/Triangle.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.bridge;
+package com.baeldung.bridge;
public class Triangle extends Shape {
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/AuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/AuthenticationProcessor.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/AuthenticationProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/AuthenticationProvider.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/OAuthAuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/OAuthAuthenticationProcessor.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/OAuthTokenProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/OAuthTokenProvider.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/SamlAuthenticationProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/SamlAuthenticationProvider.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/UsernamePasswordProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/chainofresponsibility/UsernamePasswordProvider.java
rename to patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/client/TextFileApplication.java b/patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/client/TextFileApplication.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/OpenTextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/OpenTextFileOperation.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/SaveTextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/SaveTextFileOperation.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/TextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/command/TextFileOperation.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/invoker/TextFileOperationExecutor.java b/patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/invoker/TextFileOperationExecutor.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/receiver/TextFile.java b/patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/command/receiver/TextFile.java
rename to patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/composite/CompositeDemo.java b/patterns/design-patterns/src/main/java/com/baeldung/composite/CompositeDemo.java
similarity index 92%
rename from core-java/src/main/java/com/baeldung/designpatterns/composite/CompositeDemo.java
rename to patterns/design-patterns/src/main/java/com/baeldung/composite/CompositeDemo.java
index 9537dd0d2b..2296912c76 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/composite/CompositeDemo.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/composite/CompositeDemo.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.composite;
+package com.baeldung.composite;
/**
* Created by Gebruiker on 5/3/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/composite/Department.java b/patterns/design-patterns/src/main/java/com/baeldung/composite/Department.java
similarity index 70%
rename from core-java/src/main/java/com/baeldung/designpatterns/composite/Department.java
rename to patterns/design-patterns/src/main/java/com/baeldung/composite/Department.java
index 82fa3a3efc..7e623a9337 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/composite/Department.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/composite/Department.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.composite;
+package com.baeldung.composite;
/**
* Created by Gebruiker on 5/1/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/composite/FinancialDepartment.java b/patterns/design-patterns/src/main/java/com/baeldung/composite/FinancialDepartment.java
similarity index 92%
rename from core-java/src/main/java/com/baeldung/designpatterns/composite/FinancialDepartment.java
rename to patterns/design-patterns/src/main/java/com/baeldung/composite/FinancialDepartment.java
index dc5a2bb9d9..173281f833 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/composite/FinancialDepartment.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/composite/FinancialDepartment.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.composite;
+package com.baeldung.composite;
/**
* Created by Gebruiker on 5/1/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/composite/HeadDepartment.java b/patterns/design-patterns/src/main/java/com/baeldung/composite/HeadDepartment.java
similarity index 94%
rename from core-java/src/main/java/com/baeldung/designpatterns/composite/HeadDepartment.java
rename to patterns/design-patterns/src/main/java/com/baeldung/composite/HeadDepartment.java
index 119b9c76b5..f54bcf303b 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/composite/HeadDepartment.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/composite/HeadDepartment.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.composite;
+package com.baeldung.composite;
import java.util.ArrayList;
import java.util.List;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/composite/SalesDepartment.java b/patterns/design-patterns/src/main/java/com/baeldung/composite/SalesDepartment.java
similarity index 92%
rename from core-java/src/main/java/com/baeldung/designpatterns/composite/SalesDepartment.java
rename to patterns/design-patterns/src/main/java/com/baeldung/composite/SalesDepartment.java
index af234b4915..7f5e903100 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/composite/SalesDepartment.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/composite/SalesDepartment.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.composite;
+package com.baeldung.composite;
/**
* Created by Gebruiker on 5/1/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
similarity index 63%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
index 46d97d1a15..5b4bf08006 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public interface AbstractFactory {
Animal getAnimal(String toyType) ;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
index 7ab166e16a..68759d5aff 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class AbstractPatternDriver {
public static void main(String[] args) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
similarity index 52%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
index 59c1336053..52a8c83752 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Animal.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public interface Animal {
String getType();
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
index 49583c3a98..bbc3eb7a82 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/AnimalFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class AnimalFactory implements AbstractFactory {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
similarity index 64%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
index f251285ebf..d395d9de33 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Brown.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class Brown implements Color {
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Color.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Color.java
new file mode 100644
index 0000000000..337760fa4d
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Color.java
@@ -0,0 +1,5 @@
+package com.baeldung.creational.abstractfactory;
+
+public interface Color {
+ String getColor();
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
index 8f7559ff27..8b7e4f8086 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/ColorFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class ColorFactory implements AbstractFactory {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
similarity index 74%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
index 002b5665d3..38e90f34dc 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Dog.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class Dog implements Animal {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
similarity index 75%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
index 5603ad6eee..678ae5ca0c 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/Duck.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class Duck implements Animal {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
similarity index 83%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
index fcbee1e6de..34ddbea545 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/FactoryProvider.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class FactoryProvider {
public static AbstractFactory getFactory(String choice){
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/White.java
similarity index 64%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/White.java
index 62ef8048ea..6cb1e4cdd4 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/abstractfactory/White.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/White.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
public class White implements Color {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BankAccount.java
similarity index 96%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BankAccount.java
index 355fa74895..1c6b0cc78e 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BankAccount.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BankAccount.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.builder;
+package com.baeldung.creational.builder;
public class BankAccount {
private String name;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
index d92a70e664..2d3a88a86b 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/builder/BuilderPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.builder;
+package com.baeldung.creational.builder;
public class BuilderPatternDriver {
public static void main(String[] args) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
similarity index 89%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
index 64ee307bb8..9261a5c0cb 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/FactoryDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class FactoryDriver {
public static void main(String[] args) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Heptagon.java
similarity index 69%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Heptagon.java
index 935fc2f04c..9e6f04b951 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Heptagon.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Heptagon.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class Heptagon implements Polygon {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Octagon.java
similarity index 68%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Octagon.java
index fc62302dc8..b5c3be8a87 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Octagon.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Octagon.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class Octagon implements Polygon {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Pentagon.java
similarity index 69%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Pentagon.java
index 65d109b10b..0866de4f25 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Pentagon.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Pentagon.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class Pentagon implements Polygon {
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Polygon.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Polygon.java
new file mode 100644
index 0000000000..ed3f13eed6
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Polygon.java
@@ -0,0 +1,5 @@
+package com.baeldung.creational.factory;
+
+public interface Polygon {
+ String getType();
+}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
similarity index 89%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
index 9f34fe77b9..c9af0952da 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/PolygonFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class PolygonFactory {
public Polygon getPolygon(int numberOfSides) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Square.java
similarity index 68%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Square.java
index 805c1c9ae3..5c19873f00 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Square.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Square.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class Square implements Polygon {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Triangle.java
similarity index 69%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Triangle.java
index 8a8832d8a1..2f84674ae5 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/factory/Triangle.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/factory/Triangle.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
public class Triangle implements Polygon {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/Singleton.java
similarity index 83%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/Singleton.java
index 1a5ac82c89..e914fbd4af 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/Singleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/Singleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.singleton;
+package com.baeldung.creational.singleton;
public class Singleton {
private Singleton() {}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
similarity index 76%
rename from core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
index 1955008d3e..555e751acb 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/creational/singleton/SingletonDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.singleton;
+package com.baeldung.creational.singleton;
public class SingletonDriver {
public static void main(String[] args) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/BubbleLights.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/BubbleLights.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/BubbleLights.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/BubbleLights.java
index 881add8b21..fff5a95b4b 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/BubbleLights.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/BubbleLights.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
public class BubbleLights extends TreeDecorator {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTree.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTree.java
similarity index 54%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTree.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTree.java
index e5dca41dd8..be07f4faf2 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTree.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTree.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
public interface ChristmasTree {
String decorate();
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTreeImpl.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
similarity index 75%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTreeImpl.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
index 9241fd59db..2b9e210eab 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/ChristmasTreeImpl.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
public class ChristmasTreeImpl implements ChristmasTree {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/DecoratorPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
similarity index 80%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/DecoratorPatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
index 70b4f801cd..c20c23ff6e 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/DecoratorPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
@@ -1,6 +1,6 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
-import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+import static com.baeldung.util.LogerUtil.LOG;
public class DecoratorPatternDriver {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/Garland.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/Garland.java
similarity index 86%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/Garland.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/Garland.java
index d2efd6e451..d3cb28a9e9 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/Garland.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/Garland.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
public class Garland extends TreeDecorator {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/decorator/TreeDecorator.java b/patterns/design-patterns/src/main/java/com/baeldung/decorator/TreeDecorator.java
similarity index 85%
rename from core-java/src/main/java/com/baeldung/designpatterns/decorator/TreeDecorator.java
rename to patterns/design-patterns/src/main/java/com/baeldung/decorator/TreeDecorator.java
index 5427d2ac7e..47385a1967 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/decorator/TreeDecorator.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/decorator/TreeDecorator.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.decorator;
+package com.baeldung.decorator;
public abstract class TreeDecorator implements ChristmasTree {
private ChristmasTree tree;
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/CarEngineFacade.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/CarEngineFacade.java
similarity index 92%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/CarEngineFacade.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/CarEngineFacade.java
index 91f9b79738..27a1eb2729 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/CarEngineFacade.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/CarEngineFacade.java
@@ -1,6 +1,6 @@
-package com.baeldung.pattern.facade;
+package com.baeldung.facade;
-import com.baeldung.pattern.facade.carsystem.*;
+import com.baeldung.facade.carsystem.*;
public class CarEngineFacade {
private static final Integer DEFAULT_COOLING_TEMP = 90;
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowController.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
similarity index 90%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowController.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
index 5ee846ea31..c9cf130e20 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowController.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowMeter.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
similarity index 68%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowMeter.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
index b47f9cfc4a..4eb7ac3c44 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/AirFlowMeter.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,6 +8,6 @@ public class AirFlowMeter {
private static final Logger LOGGER = LoggerFactory.getLogger(AirFlowMeter.class);
public void getMeasurements() {
- LOGGER.info("Getting air measurements...");
+ LOGGER.info("Getting air measurements..");
}
}
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CatalyticConverter.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
similarity index 88%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CatalyticConverter.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
index 7d637cd444..0abc8c58ce 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CatalyticConverter.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CoolingController.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
similarity index 91%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CoolingController.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
index ae556e685c..c13850d166 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/CoolingController.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@ public class CoolingController {
}
public void stop() {
- LOGGER.info("Stopping Cooling Controller...");
+ LOGGER.info("Stopping Cooling Controller..");
radiator.off();
}
}
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelInjector.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
similarity index 82%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelInjector.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
index c7905745e4..a619508e7a 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelInjector.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,6 +18,6 @@ public class FuelInjector {
}
public void off() {
- LOGGER.info("Stopping Fuel injector...");
+ LOGGER.info("Stopping Fuel injector..");
}
}
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelPump.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
similarity index 66%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelPump.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
index 900358f8ff..0cd193558d 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/FuelPump.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,6 +8,6 @@ public class FuelPump {
private static final Logger LOGGER = LoggerFactory.getLogger(FuelPump.class);
public void pump() {
- LOGGER.info("Fuel Pump is pumping fuel...");
+ LOGGER.info("Fuel Pump is pumping fuel..");
}
}
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Radiator.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Radiator.java
similarity index 90%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Radiator.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Radiator.java
index 6ca6cef9d9..c1004f561f 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Radiator.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Radiator.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Starter.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Starter.java
similarity index 70%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Starter.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Starter.java
index b1f45a0be8..5f13d5726a 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/Starter.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/Starter.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,6 +8,6 @@ public class Starter {
private static final Logger LOGGER = LoggerFactory.getLogger(Starter.class);
public void start() {
- LOGGER.info("Starting...");
+ LOGGER.info("Starting..");
}
}
diff --git a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/TemperatureSensor.java b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
similarity index 67%
rename from patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/TemperatureSensor.java
rename to patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
index d6a94858b4..5850a8a3be 100644
--- a/patterns/facade/src/main/java/com/baeldung/pattern/facade/carsystem/TemperatureSensor.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade.carsystem;
+package com.baeldung.facade.carsystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -7,7 +7,7 @@ public class TemperatureSensor {
private static final Logger LOGGER = LoggerFactory.getLogger(TemperatureSensor.class);
public void getTemperature(){
- LOGGER.info("Getting temperature from the sensor...");
+ LOGGER.info("Getting temperature from the sensor..");
}
}
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Car.java b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Car.java
similarity index 83%
rename from core-java/src/main/java/com/baeldung/designpatterns/flyweight/Car.java
rename to patterns/design-patterns/src/main/java/com/baeldung/flyweight/Car.java
index 50f62cafaa..a0b1a7cdf5 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Car.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Car.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.flyweight;
+package com.baeldung.flyweight;
import java.awt.Color;
@@ -53,7 +53,7 @@ public class Car implements Vehicle {
/*
* (non-Javadoc)
*
- * @see com.baeldung.designpatterns.flyweight.Vehicle#start()
+ * @see com.baeldung.flyweight.Vehicle#start()
*/
@Override
public void start() {
@@ -64,7 +64,7 @@ public class Car implements Vehicle {
/*
* (non-Javadoc)
*
- * @see com.baeldung.designpatterns.flyweight.Vehicle#stop()
+ * @see com.baeldung.flyweight.Vehicle#stop()
*/
@Override
public void stop() {
@@ -75,7 +75,7 @@ public class Car implements Vehicle {
/*
* (non-Javadoc)
*
- * @see com.baeldung.designpatterns.flyweight.Vehicle#getColor()
+ * @see com.baeldung.flyweight.Vehicle#getColor()
*/
@Override
public Color getColor() {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Engine.java b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Engine.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/flyweight/Engine.java
rename to patterns/design-patterns/src/main/java/com/baeldung/flyweight/Engine.java
index 05d9ca98b8..2319f61a74 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Engine.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Engine.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.flyweight;
+package com.baeldung.flyweight;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Vehicle.java b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Vehicle.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/flyweight/Vehicle.java
rename to patterns/design-patterns/src/main/java/com/baeldung/flyweight/Vehicle.java
index c285f9fcff..8cbb8e2896 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/Vehicle.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/Vehicle.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.flyweight;
+package com.baeldung.flyweight;
import java.awt.Color;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/VehicleFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/VehicleFactory.java
similarity index 96%
rename from core-java/src/main/java/com/baeldung/designpatterns/flyweight/VehicleFactory.java
rename to patterns/design-patterns/src/main/java/com/baeldung/flyweight/VehicleFactory.java
index 2854b7dab1..ff0dbbdada 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/flyweight/VehicleFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/flyweight/VehicleFactory.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.flyweight;
+package com.baeldung.flyweight;
import java.awt.Color;
import java.util.HashMap;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/Channel.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/Channel.java
similarity index 58%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/Channel.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/Channel.java
index 9ca2edac38..dcffe1a37d 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/Channel.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/Channel.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
public interface Channel {
public void update(Object o);
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/NewsAgency.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/NewsAgency.java
similarity index 91%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/NewsAgency.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/NewsAgency.java
index 0330fbdcdc..02e2872417 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/NewsAgency.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/NewsAgency.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import java.util.ArrayList;
import java.util.List;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/NewsChannel.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/NewsChannel.java
similarity index 86%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/NewsChannel.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/NewsChannel.java
index 09c22e0ad8..fd0178ca45 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/NewsChannel.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/NewsChannel.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
public class NewsChannel implements Channel {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsAgency.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsAgency.java
similarity index 83%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsAgency.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsAgency.java
index 2849820663..b567ad295a 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsAgency.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsAgency.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import java.util.Observable;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsChannel.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsChannel.java
similarity index 89%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsChannel.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsChannel.java
index 3989fe0286..20cc1811bf 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/ONewsChannel.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/ONewsChannel.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import java.util.Observable;
import java.util.Observer;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsAgency.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsAgency.java
similarity index 93%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsAgency.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsAgency.java
index b05b97ab0b..df46731a85 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsAgency.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsAgency.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsChannel.java b/patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsChannel.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsChannel.java
rename to patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsChannel.java
index ff8d35463c..d3e096f7e8 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/observer/PCLNewsChannel.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/observer/PCLNewsChannel.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObject.java b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObject.java
similarity index 57%
rename from core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObject.java
rename to patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObject.java
index 256b31bc84..ae7820024c 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObject.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObject.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.proxy;
+package com.baeldung.proxy;
public interface ExpensiveObject {
void process();
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectImpl.java b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
similarity index 64%
rename from core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectImpl.java
rename to patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
index de31e22b30..7ade31da88 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectImpl.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
@@ -1,6 +1,6 @@
-package com.baeldung.designpatterns.proxy;
+package com.baeldung.proxy;
-import static com.baeldung.designpatterns.util.LogerUtil.LOG;;
+import static com.baeldung.util.LogerUtil.LOG;;
public class ExpensiveObjectImpl implements ExpensiveObject {
@@ -14,7 +14,7 @@ public class ExpensiveObjectImpl implements ExpensiveObject {
}
private void heavyInitialConfiguration() {
- LOG.info("Loading initial configuration...");
+ LOG.info("Loading initial configuration..");
}
}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectProxy.java b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
similarity index 86%
rename from core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectProxy.java
rename to patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
index f36e688c90..f7985f331e 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ExpensiveObjectProxy.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.proxy;
+package com.baeldung.proxy;
public class ExpensiveObjectProxy implements ExpensiveObject{
private static ExpensiveObject object;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ProxyPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
similarity index 82%
rename from core-java/src/main/java/com/baeldung/designpatterns/proxy/ProxyPatternDriver.java
rename to patterns/design-patterns/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
index 088b069e28..02e4de96ea 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/proxy/ProxyPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.proxy;
+package com.baeldung.proxy;
public class ProxyPatternDriver {
public static void main(String[] args) {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/Cache.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/Cache.java
similarity index 94%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/Cache.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/Cache.java
index 847d8a71e0..c215dda91f 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/Cache.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/Cache.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
import java.util.ArrayList;
import java.util.List;
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/EmailService.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/EmailService.java
similarity index 82%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/EmailService.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/EmailService.java
index 7ac7e05790..930312aecd 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/EmailService.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/EmailService.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
/**
* Created by Gebruiker on 4/20/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/InitialContext.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/InitialContext.java
similarity index 87%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/InitialContext.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/InitialContext.java
index d5234b39cd..3614b212f5 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/InitialContext.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/InitialContext.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
/**
* Created by Gebruiker on 4/20/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/Main.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/Main.java
similarity index 91%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/Main.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/Main.java
index 787f7e708c..984410a991 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/Main.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/Main.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
/**
* Created by Gebruiker on 4/20/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/MessagingService.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/MessagingService.java
similarity index 65%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/MessagingService.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/MessagingService.java
index 5853dfd7f7..0b48d9ea5e 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/MessagingService.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/MessagingService.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
public interface MessagingService {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/SMSService.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/SMSService.java
similarity index 82%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/SMSService.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/SMSService.java
index 87255ef658..d0bc13b847 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/SMSService.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/SMSService.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
/**
* Created by Gebruiker on 4/20/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/ServiceLocator.java b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/ServiceLocator.java
similarity index 91%
rename from core-java/src/main/java/com/baeldung/designpatterns/service/locator/ServiceLocator.java
rename to patterns/design-patterns/src/main/java/com/baeldung/service/locator/ServiceLocator.java
index 7e1a2349a1..6da441d0aa 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/service/locator/ServiceLocator.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/service/locator/ServiceLocator.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.service.locator;
+package com.baeldung.service.locator;
/**
* Created by Gebruiker on 4/20/2018.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/ClassSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/ClassSingleton.java
similarity index 91%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/ClassSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/ClassSingleton.java
index 0fc86e30a7..d538e6dda3 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/ClassSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/ClassSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton;
+package com.baeldung.singleton;
public class ClassSingleton {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/EnumSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/EnumSingleton.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/EnumSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/EnumSingleton.java
index f75484477b..89321a6b3f 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/EnumSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/EnumSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton;
+package com.baeldung.singleton;
public enum EnumSingleton {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/Sandbox.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/Sandbox.java
similarity index 96%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/Sandbox.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/Sandbox.java
index f8ca2ffa78..c7fb363336 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/Sandbox.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/Sandbox.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton;
+package com.baeldung.singleton;
public class Sandbox {
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DclSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
similarity index 91%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DclSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
index e10f111a56..26cd9927b4 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DclSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
/**
* Double-checked locking design pattern applied to a singleton.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DraconianSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DraconianSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
index 1d01c49b13..9c51b4044b 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/DraconianSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
/**
* Draconian singleton. The method to get the instance is synchronized.
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EarlyInitSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
similarity index 90%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EarlyInitSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
index 18c4b7cdce..22e1d3edab 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EarlyInitSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
/**
* Singleton with early initialization. Inlines the singleton instance
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EnumSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
similarity index 77%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EnumSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
index b7ff7f50b1..afa6911910 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/EnumSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
/**
* Enum singleton pattern. Uses an enum to hold a reference to the singleton
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/InitOnDemandSingleton.java b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
similarity index 92%
rename from core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/InitOnDemandSingleton.java
rename to patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
index d76bada786..46feab6208 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/singleton/synchronization/InitOnDemandSingleton.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
/**
* Initialization on demand singleton pattern. Uses a nested static class to
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/application/Application.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/application/Application.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/Computer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/Computer.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/ComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/ComputerBuilder.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputer.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/HighEndComputerBuilder.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputer.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
diff --git a/patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
similarity index 100%
rename from patterns/behavioral-patterns/src/main/java/com/baeldung/pattern/templatemethod/model/StandardComputerBuilder.java
rename to patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
diff --git a/core-java/src/main/java/com/baeldung/designpatterns/util/LogerUtil.java b/patterns/design-patterns/src/main/java/com/baeldung/util/LogerUtil.java
similarity index 94%
rename from core-java/src/main/java/com/baeldung/designpatterns/util/LogerUtil.java
rename to patterns/design-patterns/src/main/java/com/baeldung/util/LogerUtil.java
index f7b6e4f3e9..7217a4bc40 100644
--- a/core-java/src/main/java/com/baeldung/designpatterns/util/LogerUtil.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/util/LogerUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.util;
+package com.baeldung.util;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/AdapterPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/AdapterPatternIntegrationTest.java
similarity index 68%
rename from core-java/src/test/java/com/baeldung/designpatterns/AdapterPatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/AdapterPatternIntegrationTest.java
index 8cad1290d9..78a1492d83 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/AdapterPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/AdapterPatternIntegrationTest.java
@@ -1,15 +1,15 @@
-package com.baeldung.designpatterns;
+package com.baeldung;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.baeldung.designpatterns.adapter.AstonMartin;
-import com.baeldung.designpatterns.adapter.BugattiVeyron;
-import com.baeldung.designpatterns.adapter.McLaren;
-import com.baeldung.designpatterns.adapter.Movable;
-import com.baeldung.designpatterns.adapter.MovableAdapter;
-import com.baeldung.designpatterns.adapter.MovableAdapterImpl;
+import com.baeldung.adapter.AstonMartin;
+import com.baeldung.adapter.BugattiVeyron;
+import com.baeldung.adapter.McLaren;
+import com.baeldung.adapter.Movable;
+import com.baeldung.adapter.MovableAdapter;
+import com.baeldung.adapter.MovableAdapterImpl;
public class AdapterPatternIntegrationTest {
@Test
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/BridgePatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/BridgePatternIntegrationTest.java
similarity index 64%
rename from core-java/src/test/java/com/baeldung/designpatterns/BridgePatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/BridgePatternIntegrationTest.java
index ed7eb0c453..adcb5cdd2c 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/BridgePatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/BridgePatternIntegrationTest.java
@@ -1,14 +1,14 @@
-package com.baeldung.designpatterns;
+package com.baeldung;
import static org.junit.Assert.*;
import org.junit.Test;
-import com.baeldung.designpatterns.bridge.Blue;
-import com.baeldung.designpatterns.bridge.Red;
-import com.baeldung.designpatterns.bridge.Shape;
-import com.baeldung.designpatterns.bridge.Square;
-import com.baeldung.designpatterns.bridge.Triangle;
+import com.baeldung.bridge.Blue;
+import com.baeldung.bridge.Red;
+import com.baeldung.bridge.Shape;
+import com.baeldung.bridge.Square;
+import com.baeldung.bridge.Triangle;
public class BridgePatternIntegrationTest {
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/DecoratorPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/DecoratorPatternIntegrationTest.java
similarity index 69%
rename from core-java/src/test/java/com/baeldung/designpatterns/DecoratorPatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/DecoratorPatternIntegrationTest.java
index de0ca8a135..23a717ae2e 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/DecoratorPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/DecoratorPatternIntegrationTest.java
@@ -1,13 +1,13 @@
-package com.baeldung.designpatterns;
+package com.baeldung;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.baeldung.designpatterns.decorator.BubbleLights;
-import com.baeldung.designpatterns.decorator.ChristmasTree;
-import com.baeldung.designpatterns.decorator.ChristmasTreeImpl;
-import com.baeldung.designpatterns.decorator.Garland;
+import com.baeldung.decorator.BubbleLights;
+import com.baeldung.decorator.ChristmasTree;
+import com.baeldung.decorator.ChristmasTreeImpl;
+import com.baeldung.decorator.Garland;
public class DecoratorPatternIntegrationTest {
@Test
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/ProxyPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/ProxyPatternIntegrationTest.java
similarity index 80%
rename from core-java/src/test/java/com/baeldung/designpatterns/ProxyPatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/ProxyPatternIntegrationTest.java
index 7fa95b31d7..c035793b64 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/ProxyPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/ProxyPatternIntegrationTest.java
@@ -1,6 +1,6 @@
-package com.baeldung.designpatterns;
+package com.baeldung;
-import static com.baeldung.designpatterns.util.LogerUtil.LOG;
+import static com.baeldung.util.LogerUtil.LOG;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -11,8 +11,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.baeldung.designpatterns.proxy.ExpensiveObject;
-import com.baeldung.designpatterns.proxy.ExpensiveObjectProxy;
+import com.baeldung.proxy.ExpensiveObject;
+import com.baeldung.proxy.ExpensiveObjectProxy;
public class ProxyPatternIntegrationTest {
public static TestAppenderDP appender;
@@ -31,7 +31,7 @@ public class ProxyPatternIntegrationTest {
final List log = appender.getLog();
- assertThat((String) log.get(0).getMessage(), is("Loading initial configuration..."));
+ assertThat((String) log.get(0).getMessage(), is("Loading initial configuration.."));
assertThat((String) log.get(1).getMessage(), is("processing complete."));
assertThat((String) log.get(2).getMessage(), is("processing complete."));
}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/TestAppenderDP.java b/patterns/design-patterns/src/test/java/com/baeldung/TestAppenderDP.java
similarity index 94%
rename from core-java/src/test/java/com/baeldung/designpatterns/TestAppenderDP.java
rename to patterns/design-patterns/src/test/java/com/baeldung/TestAppenderDP.java
index 613c26fa13..2b3bc47292 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/TestAppenderDP.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/TestAppenderDP.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns;
+package com.baeldung;
import java.util.ArrayList;
import java.util.List;
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/chainofresponsibility/ChainOfResponsibilityTest.java b/patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/chainofresponsibility/ChainOfResponsibilityTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityTest.java
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/OpenTextFileOperationUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/OpenTextFileOperationUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/SaveTextFileOperationUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/SaveTextFileOperationUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/TextFileOperationExecutorUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/TextFileOperationExecutorUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/TextFileUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/command/test/TextFileUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
similarity index 91%
rename from core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
index dc02b976a0..6d1a4ad8fd 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/creational/abstractfactory/AbstractPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.abstractfactory;
+package com.baeldung.creational.abstractfactory;
import static org.junit.Assert.*;
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
similarity index 95%
rename from core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
index 898330b26e..03b0b3db90 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/creational/builder/BuilderPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.builder;
+package com.baeldung.creational.builder;
import static org.junit.Assert.assertEquals;
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
similarity index 94%
rename from core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
index ed0419c16d..61cf83c1e7 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/creational/factory/FactoryIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.factory;
+package com.baeldung.creational.factory;
import static org.junit.Assert.*;
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
similarity index 92%
rename from core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
index a3d5b7a14d..7c3d134ae6 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/creational/singleton/SingletonIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.creational.singleton;
+package com.baeldung.creational.singleton;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git a/patterns/facade/src/test/java/com/baeldung/pattern/facade/CarEngineFacadeTest.java b/patterns/design-patterns/src/test/java/com/baeldung/facade/CarEngineFacadeTest.java
similarity index 94%
rename from patterns/facade/src/test/java/com/baeldung/pattern/facade/CarEngineFacadeTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/facade/CarEngineFacadeTest.java
index 79c159319d..88c5d3c9bc 100644
--- a/patterns/facade/src/test/java/com/baeldung/pattern/facade/CarEngineFacadeTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/facade/CarEngineFacadeTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.facade;
+package com.baeldung.facade;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -35,12 +35,12 @@ public class CarEngineFacadeTest {
CarEngineFacade carEngineFacade = new CarEngineFacade();
carEngineFacade.startEngine();
assertTrue(appender.logContains("Fuel injector ready to inject fuel."));
- assertTrue(appender.logContains("Getting air measurements..."));
+ assertTrue(appender.logContains("Getting air measurements.."));
assertTrue(appender.logContains("Air provided!"));
assertTrue(appender.logContains("Fuel injector ready to inject fuel."));
- assertTrue(appender.logContains("Fuel Pump is pumping fuel..."));
+ assertTrue(appender.logContains("Fuel Pump is pumping fuel.."));
assertTrue(appender.logContains("Fuel injected."));
- assertTrue(appender.logContains("Starting..."));
+ assertTrue(appender.logContains("Starting.."));
assertTrue(appender.logContains("Setting temperature upper limit to 90"));
assertTrue(appender.logContains("Cooling Controller ready!"));
assertTrue(appender.logContains("Setting radiator speed to 10"));
@@ -52,12 +52,12 @@ public class CarEngineFacadeTest {
public void whenStopEngine_thenAllNecessaryActionsPerformed() {
CarEngineFacade carEngineFacade = new CarEngineFacade();
carEngineFacade.stopEngine();
- assertTrue(appender.logContains("Stopping Fuel injector..."));
+ assertTrue(appender.logContains("Stopping Fuel injector.."));
assertTrue(appender.logContains("Catalytic Converter switched off!"));
assertTrue(appender.logContains("Scheduled cooling with maximum allowed temperature 50"));
- assertTrue(appender.logContains("Getting temperature from the sensor..."));
+ assertTrue(appender.logContains("Getting temperature from the sensor.."));
assertTrue(appender.logContains("Radiator switched on!"));
- assertTrue(appender.logContains("Stopping Cooling Controller..."));
+ assertTrue(appender.logContains("Stopping Cooling Controller.."));
assertTrue(appender.logContains("Radiator switched off!"));
assertTrue(appender.logContains("Air controller switched off."));
}
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/flyweight/FlyweightUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/designpatterns/flyweight/FlyweightUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
index 645e2fd459..ab8ed32b4e 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/flyweight/FlyweightUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.flyweight;
+package com.baeldung.flyweight;
import java.awt.Color;
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/observer/ObserverIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
similarity index 87%
rename from core-java/src/test/java/com/baeldung/designpatterns/observer/ObserverIntegrationTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
index a8a0e29990..5590ecd717 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/observer/ObserverIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
@@ -1,11 +1,11 @@
-package com.baeldung.designpatterns.observer;
+package com.baeldung.observer;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.baeldung.designpatterns.observer.NewsAgency;
-import com.baeldung.designpatterns.observer.NewsChannel;
+import com.baeldung.observer.NewsAgency;
+import com.baeldung.observer.NewsChannel;
public class ObserverIntegrationTest {
diff --git a/core-java/src/test/java/com/baeldung/designpatterns/singleton/synchronization/SingletonSynchronizationUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/designpatterns/singleton/synchronization/SingletonSynchronizationUnitTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationUnitTest.java
index 2c1a3fe093..08a70f6056 100644
--- a/core-java/src/test/java/com/baeldung/designpatterns/singleton/synchronization/SingletonSynchronizationUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.designpatterns.singleton.synchronization;
+package com.baeldung.singleton.synchronization;
import java.util.Collections;
import java.util.HashSet;
diff --git a/patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/templatemethod/test/TemplateMethodPatternTest.java b/patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternTest.java
similarity index 100%
rename from patterns/behavioral-patterns/src/test/java/com/baeldung/pattern/templatemethod/test/TemplateMethodPatternTest.java
rename to patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternTest.java
diff --git a/patterns/facade/pom.xml b/patterns/facade/pom.xml
deleted file mode 100644
index 573e557eb6..0000000000
--- a/patterns/facade/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- 4.0.0
- com.baeldung.pattern.facade
- pattern.facade
- 1.0
- jar
-
- com.baeldung.patterns
- patterns-parent
- 1.0.0-SNAPSHOT
- ..
-
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
- UTF-8
- 1.8
- 1.8
-
-
\ No newline at end of file
diff --git a/patterns/front-controller/pom.xml b/patterns/front-controller/pom.xml
index 877277a062..a12d606165 100644
--- a/patterns/front-controller/pom.xml
+++ b/patterns/front-controller/pom.xml
@@ -7,7 +7,7 @@
patterns-parent
- com.baeldung.patterns
+ com.baeldung
1.0.0-SNAPSHOT
..
diff --git a/patterns/intercepting-filter/pom.xml b/patterns/intercepting-filter/pom.xml
index b9916d9157..8c68302315 100644
--- a/patterns/intercepting-filter/pom.xml
+++ b/patterns/intercepting-filter/pom.xml
@@ -7,7 +7,7 @@
war
- com.baeldung.patterns
+ com.baeldung
patterns-parent
1.0.0-SNAPSHOT
..
diff --git a/patterns/pom.xml b/patterns/pom.xml
index 7ee2c749be..a811664b86 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- com.baeldung.patterns
+ com.baeldung
patterns-parent
pom
@@ -16,7 +16,7 @@
front-controller
intercepting-filter
- behavioral-patterns
+ design-patterns