diff --git a/backend/components/Helper.php b/backend/components/Helper.php
index d28afa5..157891b 100644
--- a/backend/components/Helper.php
+++ b/backend/components/Helper.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: denys
- * Date: 29.10.15
- * Time: 11:35
- */
 
 namespace backend\components;
 
@@ -40,4 +34,23 @@ class Helper
         );
         return strtr($str, $converter);
     }
+
+    public static function findUrl($filePath, $countDir) {
+        $pathArr = explode('/', $filePath);
+        $n = count($pathArr);
+        $url = '';
+        for ($i = $n - $countDir - 1; $i < $n; $i++)
+            $url .= '/' . $pathArr[$i];
+        return $url;
+    }
+
+    public static function isImage($file) {
+        $a = getimagesize($file);
+        $image_type = $a[2];
+        if(in_array($image_type , [IMAGETYPE_GIF , IMAGETYPE_JPEG ,IMAGETYPE_PNG , IMAGETYPE_BMP]))
+        {
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/backend/components/croppers/CropContext.php b/backend/components/croppers/CropContext.php
index 80378ba..369b8be 100644
--- a/backend/components/croppers/CropContext.php
+++ b/backend/components/croppers/CropContext.php
@@ -6,7 +6,7 @@ namespace backend\components\croppers;
 class CropContext
 {
     /**
-     * @var CropInterface
+     * @var AbstractCrop
      */
     private $cropper;
 
diff --git a/backend/components/croppers/CropFactory.php b/backend/components/croppers/CropFactory.php
index e0879f6..dfd3e4e 100644
--- a/backend/components/croppers/CropFactory.php
+++ b/backend/components/croppers/CropFactory.php
@@ -40,6 +40,8 @@ class CropFactory
         return $min;
     }
 
+
+
     public static function getInstance() {
         if (null === self::$instance) {
             self::$instance = new self();
diff --git a/backend/controllers/ImageController.php b/backend/controllers/ImageController.php
index 76a29c8..e83f9b0 100644
--- a/backend/controllers/ImageController.php
+++ b/backend/controllers/ImageController.php
@@ -8,7 +8,6 @@ use backend\components\croppers\CropFactory;
 use backend\components\Helper;
 use Yii;
 use yii\helpers\FileHelper;
-use yii\helpers\StringHelper;
 use yii\web\Controller;
 use backend\models\UploadForm;
 use yii\web\UploadedFile;
@@ -23,22 +22,23 @@ class ImageController extends Controller
 
         if ($request->isPost) {
             $model->imageFiles = UploadedFile::getInstances($model, 'imageFiles');
-            $model->upload();
 
             $crop_id = $request->post('crop_id');
 
+            $model->upload($ukrSeeds[$crop_id]);
+
             $cropFactory = CropFactory::getInstance();
             $minHeight = $cropFactory->findMinHeight();
             $cropContext = new CropContext($cropFactory->getCrop($crop_id));
-
+            $basePath = dirname(dirname(__DIR__)) . '/uploads/'. $ukrSeeds[$crop_id] . '/';
             foreach($model->imageFiles as $file) {
                 $baseName = Helper::transliterate($file->baseName);
-                $path = dirname(dirname(__DIR__)) . '/uploads/' . $baseName . '.' . $file->extension;
+                $path = $basePath . $baseName . '.' . $file->extension;
                 $image = Yii::$app->imagine->open($path);
                 $image = $cropContext->cropImage($image, $path);
                 $box = $image->getSize()->heighten($minHeight);
                 $image->resize($box)
-                    ->save(dirname(dirname(__DIR__)) . '/uploads/' . $baseName . '-resized' . '.' . $file->extension);
+                    ->save($basePath . $baseName . '-resized' . '.' . $file->extension);
             }
         }
         return $this->render('index', ['model' => $model, 'ukrSeeds' => $ukrSeeds]);
@@ -50,12 +50,8 @@ class ImageController extends Controller
         $images = [];
 
         foreach($files as $file) {
-            $a = getimagesize($file);
-            $image_type = $a[2];
-
-            if(in_array($image_type , [IMAGETYPE_GIF , IMAGETYPE_JPEG ,IMAGETYPE_PNG , IMAGETYPE_BMP]))
-            {
-                $images[] = '/uploads/' . StringHelper::basename($file);
+            if(Helper::isImage($file)) {
+                $images[] = Helper::findUrl($file, 2);
             }
         }
         return $this->render('gallery', ['files' => $images]);
@@ -82,13 +78,10 @@ class ImageController extends Controller
         $zip = new \ZipArchive();
 
         $filename = dirname(dirname(__DIR__)) . '/uploads/images.zip';
-        $zip->open($filename, \ZipArchive::CREATE);
+        $zip->open($filename, \ZipArchive::OVERWRITE);
         foreach($files as $k => $file) {
-            $a = getimagesize($file);
-            $image_type = $a[2];
-            if(in_array($image_type , [IMAGETYPE_GIF , IMAGETYPE_JPEG ,IMAGETYPE_PNG , IMAGETYPE_BMP]))
-            {
-                $zip->addFile($file, StringHelper::basename($file));
+            if(Helper::isImage($file)) {
+                $zip->addFile($file, Helper::findUrl($file, 1));
             }
         }
         $zip->close();
diff --git a/backend/models/UploadForm.php b/backend/models/UploadForm.php
index 10f5105..a3c5c37 100644
--- a/backend/models/UploadForm.php
+++ b/backend/models/UploadForm.php
@@ -3,6 +3,7 @@ namespace backend\models;
 
 use backend\components\Helper;
 use yii\base\Model;
+use yii\helpers\FileHelper;
 use yii\web\UploadedFile;
 
 class UploadForm extends Model
@@ -12,16 +13,21 @@ class UploadForm extends Model
     public function rules()
     {
         return [
-            [['imageFiles'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg', 'maxFiles' => 20],
+            [['imageFiles'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg', 'maxFiles' => 20],
 
         ];
     }
 
-    public function upload()
+    public function upload($nameDir)
     {
+        $basePath = dirname(dirname(__DIR__)) . '/uploads/';
+
+        if(!file_exists($basePath . $nameDir))
+            FileHelper::createDirectory($basePath . $nameDir . '/');
+
         if ($this->validate()) {
             foreach($this->imageFiles as $file) {
-                $path = dirname(dirname(__DIR__)) . '/uploads/' . Helper::transliterate($file->baseName) . '.' . $file->extension;
+                $path = $basePath . $nameDir . '/' . Helper::transliterate($file->baseName) . '.' . $file->extension;
                 $file->saveAs($path);
             }
             return true;
--
libgit2 0.21.4