diff --git a/src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java b/src/main/java/kinosearch/kinosearch3/base/BaseRepository.java
similarity index 84%
rename from src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java
rename to src/main/java/kinosearch/kinosearch3/base/BaseRepository.java
index b2a6bdd..f76d4df 100644
--- a/src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java
+++ b/src/main/java/kinosearch/kinosearch3/base/BaseRepository.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-06
  */
-package kinosearch.kinosearch3.spider;
+package kinosearch.kinosearch3.base;
 
 import java.util.List;
 
diff --git a/src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java b/src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java
similarity index 94%
rename from src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java
rename to src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java
index 58f2e2c..6da51a2 100644
--- a/src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java
+++ b/src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-02
  */
-package kinosearch.kinosearch3.spider;
+package kinosearch.kinosearch3.base;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java b/src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java
similarity index 96%
rename from src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java
rename to src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java
index 738bf26..f277e64 100644
--- a/src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java
+++ b/src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java
@@ -2,7 +2,7 @@
  * DmitriyMX <dimon550@gmail.com>
  * 2017-04-06
  */
-package kinosearch.kinosearch3.spider;
+package kinosearch.kinosearch3.base;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java
index d00fddb..6ce1ccb 100644
--- a/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java
+++ b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java
@@ -5,8 +5,8 @@
 package kinosearch.kinosearch3.cinema;
 
 import kinosearch.kinosearch3.browser.Browser;
-import kinosearch.kinosearch3.spider.BaseRepository;
-import kinosearch.kinosearch3.spider.CinemaDocument;
+import kinosearch.kinosearch3.base.BaseRepository;
+import kinosearch.kinosearch3.base.CinemaDocument;
 import kinosearch.kinosearch3.spider.FileDownloader;
 import kinosearch.kinosearch3.spider.ScannerCinema;
 import org.jsoup.Jsoup;
diff --git a/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java
index 67c3b19..700627d 100644
--- a/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java
+++ b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java
@@ -5,8 +5,8 @@
 package kinosearch.kinosearch3.cinema;
 
 import kinosearch.kinosearch3.browser.Browser;
-import kinosearch.kinosearch3.spider.BaseRepository;
-import kinosearch.kinosearch3.spider.CinemaDocument;
+import kinosearch.kinosearch3.base.BaseRepository;
+import kinosearch.kinosearch3.base.CinemaDocument;
 import kinosearch.kinosearch3.spider.FileDownloader;
 import kinosearch.kinosearch3.spider.ScannerCinema;
 import org.jsoup.Jsoup;
diff --git a/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java b/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java
index 6d9d031..757b97a 100644
--- a/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java
+++ b/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java
@@ -6,8 +6,8 @@ package kinosearch.kinosearch3.webpp;
 
 import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
-import kinosearch.kinosearch3.spider.BaseRepository;
-import kinosearch.kinosearch3.spider.MongoDBRepository;
+import kinosearch.kinosearch3.base.BaseRepository;
+import kinosearch.kinosearch3.base.MongoDBRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java
index 86ce00b..281e8e7 100644
--- a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java
+++ b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java
@@ -4,8 +4,8 @@
  */
 package kinosearch.kinosearch3.webpp;
 
-import kinosearch.kinosearch3.spider.BaseRepository;
-import kinosearch.kinosearch3.spider.CinemaDocument;
+import kinosearch.kinosearch3.base.BaseRepository;
+import kinosearch.kinosearch3.base.CinemaDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml
index 3543420..c5e1569 100644
--- a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml
+++ b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml
@@ -23,7 +23,7 @@
         <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     </bean>
 
-    <bean id="repository" class="kinosearch.kinosearch3.spider.MongoDBRepository">
+    <bean id="repository" class="kinosearch.kinosearch3.base.MongoDBRepository">
         <constructor-arg name="mongoOperations" ref="mongoTemplate"/>
     </bean>
 
diff --git a/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java
index ce6ad88..cdc7e15 100644
--- a/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java
+++ b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java
@@ -4,7 +4,7 @@
  */
 package kinosearch.kinosearch3.cinema;
 
-import kinosearch.kinosearch3.spider.CinemaDocument;
+import kinosearch.kinosearch3.base.CinemaDocument;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java
index 879efc1..78276e2 100644
--- a/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java
+++ b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java
@@ -4,7 +4,7 @@
  */
 package kinosearch.kinosearch3.cinema;
 
-import kinosearch.kinosearch3.spider.CinemaDocument;
+import kinosearch.kinosearch3.base.CinemaDocument;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml
index 2c7b8dc..d50c828 100644
--- a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml
+++ b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml
@@ -14,7 +14,7 @@
         <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     </bean>
 
-    <bean id="repository" class="kinosearch.kinosearch3.spider.MongoDBRepository">
+    <bean id="repository" class="kinosearch.kinosearch3.base.MongoDBRepository">
         <constructor-arg name="mongoOperations" ref="mongoTemplate"/>
     </bean>