Обновлены файлы

src/main/java/Zoo.java

@@ -1,11 +1,11 @@
 import animals.Animal;
 import animals.Swim;
-import animals.carnivores.Bear;
+import animals.Bear;
-import animals.carnivores.Fish;
+import animals.Fish;
-import animals.carnivores.Kotik;
+import animals.Kotik;
-import animals.herbivores.Deer;
+import animals.Deer;
-import animals.herbivores.Duck;
+import animals.Duck;
-import animals.herbivores.Sheep;
+import animals.Sheep;
 import employee.Worker;
 import food.Grass;
 import food.Meat;

src/main/java/animals/Bear.java

@@ -1,7 +1,4 @@
-package animals.carnivores;
+package animals;
-import animals.Carnivorous;
-import animals.Run;
-import animals.Voice;
 
 public class Bear extends Carnivorous implements Run, Voice {
 

src/main/java/animals/Deer.java

@@ -1,6 +1,4 @@
-package animals.herbivores;
+package animals;
-import animals.Herbivore;
-import animals.Run;
 
 public class Deer extends Herbivore implements Run {
 

src/main/java/animals/Duck.java

@@ -1,5 +1,4 @@
-package animals.herbivores;
+package animals;
-import animals.*;
 
 public class Duck extends Herbivore implements Run, Swim, Fly, Voice {
 

src/main/java/animals/Fish.java

@@ -1,6 +1,4 @@
-package animals.carnivores;
+package animals;
-import animals.Carnivorous;
-import animals.Swim;
 
 public class Fish extends Carnivorous implements Swim {
 

src/main/java/animals/Herbivore.java

@@ -2,7 +2,7 @@ package animals;
 import food.Food;
 import food.Grass;
 
-public class Herbivore extends Animal{
+public abstract class Herbivore extends Animal{
 
     public Herbivore() {}
 

src/main/java/animals/Kotik.java

@@ -1,7 +1,4 @@
-package animals.carnivores;
+package animals;
-import animals.Carnivorous;
-import animals.Run;
-import animals.Voice;
 
 public class Kotik extends Carnivorous implements Run, Voice {
 

src/main/java/animals/Sheep.java

@@ -1,7 +1,4 @@
-package animals.herbivores;
+package animals;
-import animals.Herbivore;
-import animals.Run;
-import animals.Voice;
 
 public class Sheep extends Herbivore implements Run, Voice {