diff --git a/beans/pom.xml b/beans/pom.xml
new file mode 100644
index 000000000..d0cbec27d
--- /dev/null
+++ b/beans/pom.xml
@@ -0,0 +1,74 @@
+<?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">
+    <parent>
+        <artifactId>fscrawler-parent</artifactId>
+        <groupId>fr.pilato.elasticsearch.crawler</groupId>
+        <version>2.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>fscrawler-beans</artifactId>
+    <name>FSCrawler Beans</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-help-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.carrotsearch.randomizedtesting</groupId>
+                <artifactId>junit4-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- Our framework -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-framework</artifactId>
+        </dependency>
+
+        <!-- Our Settings -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-settings</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-test-framework</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-test-documents</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Attributes.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Attributes.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Attributes.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Attributes.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Doc.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Doc.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Doc.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Doc.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/DocParser.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/DocParser.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/DocParser.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/DocParser.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/File.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/File.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/File.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/File.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Meta.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Meta.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Meta.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Meta.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Path.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Path.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Path.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/Path.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/PathParser.java b/beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/PathParser.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/PathParser.java
rename to beans/src/main/java/fr/pilato/elasticsearch/crawler/fs/meta/doc/PathParser.java
diff --git a/core/pom.xml b/core/pom.xml
index 17b7dfb38..f31cbd9a7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -64,6 +64,12 @@
             <artifactId>fscrawler-settings</artifactId>
         </dependency>
 
+        <!-- Tika Extraction -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-tika</artifactId>
+        </dependency>
+
         <!-- Our Elasticsearch Client -->
         <dependency>
             <groupId>fr.pilato.elasticsearch.crawler</groupId>
diff --git a/pom.xml b/pom.xml
index e9e3fb015..b3c012c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,8 @@
         <module>integration-tests</module>
         <module>distribution</module>
         <module>cli</module>
+        <module>tika</module>
+        <module>beans</module>
     </modules>
     <name>FSCrawler</name>
     <url>https://github.com/dadoonet/fscrawler/</url>
@@ -302,6 +304,21 @@
                 <artifactId>fscrawler-elasticsearch-client</artifactId>
                 <version>2.5-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>fr.pilato.elasticsearch.crawler</groupId>
+                <artifactId>fscrawler-cli</artifactId>
+                <version>2.5-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>fr.pilato.elasticsearch.crawler</groupId>
+                <artifactId>fscrawler-beans</artifactId>
+                <version>2.5-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>fr.pilato.elasticsearch.crawler</groupId>
+                <artifactId>fscrawler-tika</artifactId>
+                <version>2.5-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.elasticsearch.client</groupId>
diff --git a/tika/pom.xml b/tika/pom.xml
new file mode 100644
index 000000000..8d898a1fd
--- /dev/null
+++ b/tika/pom.xml
@@ -0,0 +1,122 @@
+<?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">
+    <parent>
+        <artifactId>fscrawler-parent</artifactId>
+        <groupId>fr.pilato.elasticsearch.crawler</groupId>
+        <version>2.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>fscrawler-tika</artifactId>
+    <name>FSCrawler Tika</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-help-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.carrotsearch.randomizedtesting</groupId>
+                <artifactId>junit4-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- Our framework -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-framework</artifactId>
+        </dependency>
+
+        <!-- Our Beans -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-beans</artifactId>
+        </dependency>
+
+        <!-- Our Settings -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-settings</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-parsers</artifactId>
+        </dependency>
+        <!-- Add some optional dependencies -->
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+        </dependency>
+
+        <!--
+        For legal reasons (incompatible license), these dependencies are to marked as optional so users who might want
+        to use them have to provided them manually in the lib dir.
+        -->
+        <dependency>
+            <groupId>com.levigo.jbig2</groupId>
+            <artifactId>levigo-jbig2-imageio</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-jpeg2000</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- For Language detection -->
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-langdetect</artifactId>
+        </dependency>
+        <!--Dependency for parsing remote ssh directory [http://www.jcraft.com/jsch/]-->
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-test-framework</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-test-documents</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java
rename to tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParser.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java
rename to tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaInstance.java
diff --git a/core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java b/tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java
similarity index 100%
rename from core/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java
rename to tika/src/main/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParser.java
diff --git a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/DocParserTestCase.java b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/DocParserTestCase.java
similarity index 95%
rename from core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/DocParserTestCase.java
rename to tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/DocParserTestCase.java
index 7466cbb75..64ac38b85 100644
--- a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/DocParserTestCase.java
+++ b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/DocParserTestCase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package fr.pilato.elasticsearch.crawler.fs.test.unit.parser;
+package fr.pilato.elasticsearch.crawler.fs.tika;
 
 import fr.pilato.elasticsearch.crawler.fs.test.framework.AbstractFSCrawlerTestCase;
 
diff --git a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/TikaDocParserTest.java b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParserTest.java
similarity index 99%
rename from core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/TikaDocParserTest.java
rename to tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParserTest.java
index c75d55661..e0ef49b8a 100644
--- a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/TikaDocParserTest.java
+++ b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/TikaDocParserTest.java
@@ -17,13 +17,11 @@
  * under the License.
  */
 
-package fr.pilato.elasticsearch.crawler.fs.test.unit.parser;
+package fr.pilato.elasticsearch.crawler.fs.tika;
 
 import fr.pilato.elasticsearch.crawler.fs.meta.doc.Doc;
 import fr.pilato.elasticsearch.crawler.fs.meta.settings.Fs;
 import fr.pilato.elasticsearch.crawler.fs.meta.settings.FsSettings;
-import fr.pilato.elasticsearch.crawler.fs.tika.TikaDocParser;
-import fr.pilato.elasticsearch.crawler.fs.tika.TikaInstance;
 import org.apache.tika.parser.external.ExternalParser;
 import org.junit.Test;
 
diff --git a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/XmlDocParserTest.java b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParserTest.java
similarity index 91%
rename from core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/XmlDocParserTest.java
rename to tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParserTest.java
index 3ba2eeedd..c08c726c1 100644
--- a/core/src/test/java/fr/pilato/elasticsearch/crawler/fs/test/unit/parser/XmlDocParserTest.java
+++ b/tika/src/test/java/fr/pilato/elasticsearch/crawler/fs/tika/XmlDocParserTest.java
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-package fr.pilato.elasticsearch.crawler.fs.test.unit.parser;
+package fr.pilato.elasticsearch.crawler.fs.tika;
 
-import fr.pilato.elasticsearch.crawler.fs.tika.XmlDocParser;
 import org.junit.Test;
 
 import java.io.IOException;