diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..016a02c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.msb</groupId>
+    <artifactId>tank-designPatterns</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
+
+    </dependencies>
+    
+</project>
\ No newline at end of file
diff --git a/src/com/msb/Bullet.java b/src/main/java/com/msb/Bullet.java
similarity index 100%
rename from src/com/msb/Bullet.java
rename to src/main/java/com/msb/Bullet.java
diff --git a/src/com/msb/DefaultFireStrategy.java b/src/main/java/com/msb/DefaultFireStrategy.java
similarity index 100%
rename from src/com/msb/DefaultFireStrategy.java
rename to src/main/java/com/msb/DefaultFireStrategy.java
diff --git a/src/com/msb/DirEnum.java b/src/main/java/com/msb/DirEnum.java
similarity index 100%
rename from src/com/msb/DirEnum.java
rename to src/main/java/com/msb/DirEnum.java
diff --git a/src/com/msb/Explode.java b/src/main/java/com/msb/Explode.java
similarity index 100%
rename from src/com/msb/Explode.java
rename to src/main/java/com/msb/Explode.java
diff --git a/src/com/msb/FireStrategy.java b/src/main/java/com/msb/FireStrategy.java
similarity index 100%
rename from src/com/msb/FireStrategy.java
rename to src/main/java/com/msb/FireStrategy.java
diff --git a/src/com/msb/FourFireStrategy.java b/src/main/java/com/msb/FourFireStrategy.java
similarity index 100%
rename from src/com/msb/FourFireStrategy.java
rename to src/main/java/com/msb/FourFireStrategy.java
diff --git a/src/com/msb/GroupEnum.java b/src/main/java/com/msb/GroupEnum.java
similarity index 100%
rename from src/com/msb/GroupEnum.java
rename to src/main/java/com/msb/GroupEnum.java
diff --git a/src/com/msb/PropertyMgr.java b/src/main/java/com/msb/PropertyMgr.java
similarity index 100%
rename from src/com/msb/PropertyMgr.java
rename to src/main/java/com/msb/PropertyMgr.java
diff --git a/src/com/msb/ResourcesMgr.java b/src/main/java/com/msb/ResourcesMgr.java
similarity index 100%
rename from src/com/msb/ResourcesMgr.java
rename to src/main/java/com/msb/ResourcesMgr.java
diff --git a/src/com/msb/Tank.java b/src/main/java/com/msb/Tank.java
similarity index 100%
rename from src/com/msb/Tank.java
rename to src/main/java/com/msb/Tank.java
diff --git a/src/com/msb/TankDemo.java b/src/main/java/com/msb/TankDemo.java
similarity index 100%
rename from src/com/msb/TankDemo.java
rename to src/main/java/com/msb/TankDemo.java
diff --git a/src/com/msb/TankFrame.java b/src/main/java/com/msb/TankFrame.java
similarity index 100%
rename from src/com/msb/TankFrame.java
rename to src/main/java/com/msb/TankFrame.java
diff --git a/src/com/msb/abstractFactory/AK47.java b/src/main/java/com/msb/abstractFactory/AK47.java
similarity index 100%
rename from src/com/msb/abstractFactory/AK47.java
rename to src/main/java/com/msb/abstractFactory/AK47.java
diff --git a/src/com/msb/abstractFactory/AbstractFactory.java b/src/main/java/com/msb/abstractFactory/AbstractFactory.java
similarity index 100%
rename from src/com/msb/abstractFactory/AbstractFactory.java
rename to src/main/java/com/msb/abstractFactory/AbstractFactory.java
diff --git a/src/com/msb/abstractFactory/Bread.java b/src/main/java/com/msb/abstractFactory/Bread.java
similarity index 100%
rename from src/com/msb/abstractFactory/Bread.java
rename to src/main/java/com/msb/abstractFactory/Bread.java
diff --git a/src/com/msb/abstractFactory/Car.java b/src/main/java/com/msb/abstractFactory/Car.java
similarity index 100%
rename from src/com/msb/abstractFactory/Car.java
rename to src/main/java/com/msb/abstractFactory/Car.java
diff --git a/src/com/msb/abstractFactory/Food.java b/src/main/java/com/msb/abstractFactory/Food.java
similarity index 100%
rename from src/com/msb/abstractFactory/Food.java
rename to src/main/java/com/msb/abstractFactory/Food.java
diff --git a/src/com/msb/abstractFactory/Main.java b/src/main/java/com/msb/abstractFactory/Main.java
similarity index 100%
rename from src/com/msb/abstractFactory/Main.java
rename to src/main/java/com/msb/abstractFactory/Main.java
diff --git a/src/com/msb/abstractFactory/ModernFactory.java b/src/main/java/com/msb/abstractFactory/ModernFactory.java
similarity index 100%
rename from src/com/msb/abstractFactory/ModernFactory.java
rename to src/main/java/com/msb/abstractFactory/ModernFactory.java
diff --git a/src/com/msb/abstractFactory/Vehicle.java b/src/main/java/com/msb/abstractFactory/Vehicle.java
similarity index 100%
rename from src/com/msb/abstractFactory/Vehicle.java
rename to src/main/java/com/msb/abstractFactory/Vehicle.java
diff --git a/src/com/msb/abstractFactory/Weapon.java b/src/main/java/com/msb/abstractFactory/Weapon.java
similarity index 100%
rename from src/com/msb/abstractFactory/Weapon.java
rename to src/main/java/com/msb/abstractFactory/Weapon.java
diff --git a/src/com/msb/factory/Car.java b/src/main/java/com/msb/factory/Car.java
similarity index 100%
rename from src/com/msb/factory/Car.java
rename to src/main/java/com/msb/factory/Car.java
diff --git a/src/com/msb/factory/CarFactory.java b/src/main/java/com/msb/factory/CarFactory.java
similarity index 100%
rename from src/com/msb/factory/CarFactory.java
rename to src/main/java/com/msb/factory/CarFactory.java
diff --git a/src/com/msb/factory/Main.java b/src/main/java/com/msb/factory/Main.java
similarity index 100%
rename from src/com/msb/factory/Main.java
rename to src/main/java/com/msb/factory/Main.java
diff --git a/src/com/msb/factory/Moveable.java b/src/main/java/com/msb/factory/Moveable.java
similarity index 100%
rename from src/com/msb/factory/Moveable.java
rename to src/main/java/com/msb/factory/Moveable.java
diff --git a/src/com/msb/factory/Plane.java b/src/main/java/com/msb/factory/Plane.java
similarity index 100%
rename from src/com/msb/factory/Plane.java
rename to src/main/java/com/msb/factory/Plane.java
diff --git a/src/com/msb/factory/SimpleVehicleFactory.java b/src/main/java/com/msb/factory/SimpleVehicleFactory.java
similarity index 100%
rename from src/com/msb/factory/SimpleVehicleFactory.java
rename to src/main/java/com/msb/factory/SimpleVehicleFactory.java
diff --git a/src/com/msb/singleton/Singleton01.java b/src/main/java/com/msb/singleton/Singleton01.java
similarity index 100%
rename from src/com/msb/singleton/Singleton01.java
rename to src/main/java/com/msb/singleton/Singleton01.java
diff --git a/src/com/msb/singleton/Singleton02.java b/src/main/java/com/msb/singleton/Singleton02.java
similarity index 100%
rename from src/com/msb/singleton/Singleton02.java
rename to src/main/java/com/msb/singleton/Singleton02.java
diff --git a/src/com/msb/singleton/Singleton03.java b/src/main/java/com/msb/singleton/Singleton03.java
similarity index 100%
rename from src/com/msb/singleton/Singleton03.java
rename to src/main/java/com/msb/singleton/Singleton03.java
diff --git a/src/com/msb/singleton/Singleton04.java b/src/main/java/com/msb/singleton/Singleton04.java
similarity index 100%
rename from src/com/msb/singleton/Singleton04.java
rename to src/main/java/com/msb/singleton/Singleton04.java
diff --git a/src/com/msb/singleton/Singleton05.java b/src/main/java/com/msb/singleton/Singleton05.java
similarity index 100%
rename from src/com/msb/singleton/Singleton05.java
rename to src/main/java/com/msb/singleton/Singleton05.java
diff --git a/src/com/msb/singleton/Singleton06.java b/src/main/java/com/msb/singleton/Singleton06.java
similarity index 100%
rename from src/com/msb/singleton/Singleton06.java
rename to src/main/java/com/msb/singleton/Singleton06.java
diff --git a/src/com/msb/singleton/Singleton07.java b/src/main/java/com/msb/singleton/Singleton07.java
similarity index 100%
rename from src/com/msb/singleton/Singleton07.java
rename to src/main/java/com/msb/singleton/Singleton07.java
diff --git a/src/com/msb/singleton/Singleton08.java b/src/main/java/com/msb/singleton/Singleton08.java
similarity index 100%
rename from src/com/msb/singleton/Singleton08.java
rename to src/main/java/com/msb/singleton/Singleton08.java
diff --git a/src/com/msb/strategy/Cat.java b/src/main/java/com/msb/strategy/Cat.java
similarity index 100%
rename from src/com/msb/strategy/Cat.java
rename to src/main/java/com/msb/strategy/Cat.java
diff --git a/src/com/msb/strategy/Cat2.java b/src/main/java/com/msb/strategy/Cat2.java
similarity index 100%
rename from src/com/msb/strategy/Cat2.java
rename to src/main/java/com/msb/strategy/Cat2.java
diff --git a/src/com/msb/strategy/CatHeightComparator.java b/src/main/java/com/msb/strategy/CatHeightComparator.java
similarity index 100%
rename from src/com/msb/strategy/CatHeightComparator.java
rename to src/main/java/com/msb/strategy/CatHeightComparator.java
diff --git a/src/com/msb/strategy/CatWeightComparator.java b/src/main/java/com/msb/strategy/CatWeightComparator.java
similarity index 100%
rename from src/com/msb/strategy/CatWeightComparator.java
rename to src/main/java/com/msb/strategy/CatWeightComparator.java
diff --git a/src/com/msb/strategy/Comparable.java b/src/main/java/com/msb/strategy/Comparable.java
similarity index 100%
rename from src/com/msb/strategy/Comparable.java
rename to src/main/java/com/msb/strategy/Comparable.java
diff --git a/src/com/msb/strategy/Comparator.java b/src/main/java/com/msb/strategy/Comparator.java
similarity index 100%
rename from src/com/msb/strategy/Comparator.java
rename to src/main/java/com/msb/strategy/Comparator.java
diff --git a/src/com/msb/strategy/Dog.java b/src/main/java/com/msb/strategy/Dog.java
similarity index 100%
rename from src/com/msb/strategy/Dog.java
rename to src/main/java/com/msb/strategy/Dog.java
diff --git a/src/com/msb/strategy/Sorter.java b/src/main/java/com/msb/strategy/Sorter.java
similarity index 100%
rename from src/com/msb/strategy/Sorter.java
rename to src/main/java/com/msb/strategy/Sorter.java
diff --git a/src/com/msb/strategy/Sorter2.java b/src/main/java/com/msb/strategy/Sorter2.java
similarity index 100%
rename from src/com/msb/strategy/Sorter2.java
rename to src/main/java/com/msb/strategy/Sorter2.java
diff --git a/src/com/msb/util/ImageUtil.java b/src/main/java/com/msb/util/ImageUtil.java
similarity index 100%
rename from src/com/msb/util/ImageUtil.java
rename to src/main/java/com/msb/util/ImageUtil.java
diff --git a/resources/config.properties b/src/main/resources/config.properties
similarity index 100%
rename from resources/config.properties
rename to src/main/resources/config.properties
diff --git a/resources/images/0.gif b/src/main/resources/images/0.gif
similarity index 100%
rename from resources/images/0.gif
rename to src/main/resources/images/0.gif
diff --git a/resources/images/1.gif b/src/main/resources/images/1.gif
similarity index 100%
rename from resources/images/1.gif
rename to src/main/resources/images/1.gif
diff --git a/resources/images/10.gif b/src/main/resources/images/10.gif
similarity index 100%
rename from resources/images/10.gif
rename to src/main/resources/images/10.gif
diff --git a/resources/images/2.gif b/src/main/resources/images/2.gif
similarity index 100%
rename from resources/images/2.gif
rename to src/main/resources/images/2.gif
diff --git a/resources/images/3.gif b/src/main/resources/images/3.gif
similarity index 100%
rename from resources/images/3.gif
rename to src/main/resources/images/3.gif
diff --git a/resources/images/4.gif b/src/main/resources/images/4.gif
similarity index 100%
rename from resources/images/4.gif
rename to src/main/resources/images/4.gif
diff --git a/resources/images/5.gif b/src/main/resources/images/5.gif
similarity index 100%
rename from resources/images/5.gif
rename to src/main/resources/images/5.gif
diff --git a/resources/images/6.gif b/src/main/resources/images/6.gif
similarity index 100%
rename from resources/images/6.gif
rename to src/main/resources/images/6.gif
diff --git a/resources/images/7.gif b/src/main/resources/images/7.gif
similarity index 100%
rename from resources/images/7.gif
rename to src/main/resources/images/7.gif
diff --git a/resources/images/8.gif b/src/main/resources/images/8.gif
similarity index 100%
rename from resources/images/8.gif
rename to src/main/resources/images/8.gif
diff --git a/resources/images/9.gif b/src/main/resources/images/9.gif
similarity index 100%
rename from resources/images/9.gif
rename to src/main/resources/images/9.gif
diff --git a/resources/images/BadTank1.png b/src/main/resources/images/BadTank1.png
similarity index 100%
rename from resources/images/BadTank1.png
rename to src/main/resources/images/BadTank1.png
diff --git a/resources/images/BadTank2.png b/src/main/resources/images/BadTank2.png
similarity index 100%
rename from resources/images/BadTank2.png
rename to src/main/resources/images/BadTank2.png
diff --git a/resources/images/GoodTank1.png b/src/main/resources/images/GoodTank1.png
similarity index 100%
rename from resources/images/GoodTank1.png
rename to src/main/resources/images/GoodTank1.png
diff --git a/resources/images/GoodTank2.png b/src/main/resources/images/GoodTank2.png
similarity index 100%
rename from resources/images/GoodTank2.png
rename to src/main/resources/images/GoodTank2.png
diff --git a/resources/images/bulletD.gif b/src/main/resources/images/bulletD.gif
similarity index 100%
rename from resources/images/bulletD.gif
rename to src/main/resources/images/bulletD.gif
diff --git a/resources/images/bulletL.gif b/src/main/resources/images/bulletL.gif
similarity index 100%
rename from resources/images/bulletL.gif
rename to src/main/resources/images/bulletL.gif
diff --git a/resources/images/bulletR.gif b/src/main/resources/images/bulletR.gif
similarity index 100%
rename from resources/images/bulletR.gif
rename to src/main/resources/images/bulletR.gif
diff --git a/resources/images/bulletU.gif b/src/main/resources/images/bulletU.gif
similarity index 100%
rename from resources/images/bulletU.gif
rename to src/main/resources/images/bulletU.gif
diff --git a/resources/images/bulletU.png b/src/main/resources/images/bulletU.png
similarity index 100%
rename from resources/images/bulletU.png
rename to src/main/resources/images/bulletU.png
diff --git a/resources/images/e1.gif b/src/main/resources/images/e1.gif
similarity index 100%
rename from resources/images/e1.gif
rename to src/main/resources/images/e1.gif
diff --git a/resources/images/e10.gif b/src/main/resources/images/e10.gif
similarity index 100%
rename from resources/images/e10.gif
rename to src/main/resources/images/e10.gif
diff --git a/resources/images/e11.gif b/src/main/resources/images/e11.gif
similarity index 100%
rename from resources/images/e11.gif
rename to src/main/resources/images/e11.gif
diff --git a/resources/images/e12.gif b/src/main/resources/images/e12.gif
similarity index 100%
rename from resources/images/e12.gif
rename to src/main/resources/images/e12.gif
diff --git a/resources/images/e13.gif b/src/main/resources/images/e13.gif
similarity index 100%
rename from resources/images/e13.gif
rename to src/main/resources/images/e13.gif
diff --git a/resources/images/e14.gif b/src/main/resources/images/e14.gif
similarity index 100%
rename from resources/images/e14.gif
rename to src/main/resources/images/e14.gif
diff --git a/resources/images/e15.gif b/src/main/resources/images/e15.gif
similarity index 100%
rename from resources/images/e15.gif
rename to src/main/resources/images/e15.gif
diff --git a/resources/images/e16.gif b/src/main/resources/images/e16.gif
similarity index 100%
rename from resources/images/e16.gif
rename to src/main/resources/images/e16.gif
diff --git a/resources/images/e2.gif b/src/main/resources/images/e2.gif
similarity index 100%
rename from resources/images/e2.gif
rename to src/main/resources/images/e2.gif
diff --git a/resources/images/e3.gif b/src/main/resources/images/e3.gif
similarity index 100%
rename from resources/images/e3.gif
rename to src/main/resources/images/e3.gif
diff --git a/resources/images/e4.gif b/src/main/resources/images/e4.gif
similarity index 100%
rename from resources/images/e4.gif
rename to src/main/resources/images/e4.gif
diff --git a/resources/images/e5.gif b/src/main/resources/images/e5.gif
similarity index 100%
rename from resources/images/e5.gif
rename to src/main/resources/images/e5.gif
diff --git a/resources/images/e6.gif b/src/main/resources/images/e6.gif
similarity index 100%
rename from resources/images/e6.gif
rename to src/main/resources/images/e6.gif
diff --git a/resources/images/e7.gif b/src/main/resources/images/e7.gif
similarity index 100%
rename from resources/images/e7.gif
rename to src/main/resources/images/e7.gif
diff --git a/resources/images/e8.gif b/src/main/resources/images/e8.gif
similarity index 100%
rename from resources/images/e8.gif
rename to src/main/resources/images/e8.gif
diff --git a/resources/images/e9.gif b/src/main/resources/images/e9.gif
similarity index 100%
rename from resources/images/e9.gif
rename to src/main/resources/images/e9.gif
diff --git a/resources/images/missileLD.gif b/src/main/resources/images/missileLD.gif
similarity index 100%
rename from resources/images/missileLD.gif
rename to src/main/resources/images/missileLD.gif
diff --git a/resources/images/missileLU.gif b/src/main/resources/images/missileLU.gif
similarity index 100%
rename from resources/images/missileLU.gif
rename to src/main/resources/images/missileLU.gif
diff --git a/resources/images/missileRD.gif b/src/main/resources/images/missileRD.gif
similarity index 100%
rename from resources/images/missileRD.gif
rename to src/main/resources/images/missileRD.gif
diff --git a/resources/images/missileRU.gif b/src/main/resources/images/missileRU.gif
similarity index 100%
rename from resources/images/missileRU.gif
rename to src/main/resources/images/missileRU.gif
diff --git a/resources/images/square0.jpg b/src/main/resources/images/square0.jpg
similarity index 100%
rename from resources/images/square0.jpg
rename to src/main/resources/images/square0.jpg
diff --git a/resources/images/square1.jpg b/src/main/resources/images/square1.jpg
similarity index 100%
rename from resources/images/square1.jpg
rename to src/main/resources/images/square1.jpg
diff --git a/resources/images/square2.jpg b/src/main/resources/images/square2.jpg
similarity index 100%
rename from resources/images/square2.jpg
rename to src/main/resources/images/square2.jpg
diff --git a/resources/images/square3.jpg b/src/main/resources/images/square3.jpg
similarity index 100%
rename from resources/images/square3.jpg
rename to src/main/resources/images/square3.jpg
diff --git a/resources/images/square4.jpg b/src/main/resources/images/square4.jpg
similarity index 100%
rename from resources/images/square4.jpg
rename to src/main/resources/images/square4.jpg
diff --git a/resources/images/square5.jpg b/src/main/resources/images/square5.jpg
similarity index 100%
rename from resources/images/square5.jpg
rename to src/main/resources/images/square5.jpg
diff --git a/resources/images/square6.jpg b/src/main/resources/images/square6.jpg
similarity index 100%
rename from resources/images/square6.jpg
rename to src/main/resources/images/square6.jpg
diff --git a/resources/images/tank.png b/src/main/resources/images/tank.png
similarity index 100%
rename from resources/images/tank.png
rename to src/main/resources/images/tank.png
diff --git a/resources/images/tankD.gif b/src/main/resources/images/tankD.gif
similarity index 100%
rename from resources/images/tankD.gif
rename to src/main/resources/images/tankD.gif
diff --git a/resources/images/tankL.gif b/src/main/resources/images/tankL.gif
similarity index 100%
rename from resources/images/tankL.gif
rename to src/main/resources/images/tankL.gif
diff --git a/resources/images/tankLD.gif b/src/main/resources/images/tankLD.gif
similarity index 100%
rename from resources/images/tankLD.gif
rename to src/main/resources/images/tankLD.gif
diff --git a/resources/images/tankLU.gif b/src/main/resources/images/tankLU.gif
similarity index 100%
rename from resources/images/tankLU.gif
rename to src/main/resources/images/tankLU.gif
diff --git a/resources/images/tankR.gif b/src/main/resources/images/tankR.gif
similarity index 100%
rename from resources/images/tankR.gif
rename to src/main/resources/images/tankR.gif
diff --git a/resources/images/tankRD.gif b/src/main/resources/images/tankRD.gif
similarity index 100%
rename from resources/images/tankRD.gif
rename to src/main/resources/images/tankRD.gif
diff --git a/resources/images/tankRU.gif b/src/main/resources/images/tankRU.gif
similarity index 100%
rename from resources/images/tankRU.gif
rename to src/main/resources/images/tankRU.gif
diff --git a/resources/images/tankU.gif b/src/main/resources/images/tankU.gif
similarity index 100%
rename from resources/images/tankU.gif
rename to src/main/resources/images/tankU.gif
diff --git a/src/com/msb/test/CommonTest.java b/src/test/java/CommonTest.java
similarity index 98%
rename from src/com/msb/test/CommonTest.java
rename to src/test/java/CommonTest.java
index 8906c23..c03d9d2 100644
--- a/src/com/msb/test/CommonTest.java
+++ b/src/test/java/CommonTest.java
@@ -1,5 +1,3 @@
-package com.msb.test;
-
 import com.msb.DirEnum;
 import org.junit.Assert;
 import org.junit.Test;