diff --git a/dist/pom.xml b/dist/pom.xml
index bc3e40980..986d0c79c 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -188,13 +188,13 @@
                                     <from>
                                         ${project.build.directory}/crossdata-dist-${project.parent.version}/lib/com/stratio/crossdata/crossdata-server_${scala.binary.version}/${project.parent.version}
                                     </from>
-                                    <to>/opt/sds/crossdata/lib</to>
+                                    <to>/opt/sds/crossdata/lib/server</to>
                                 </copyDirectory>
                                 <copyDirectory>
                                     <from>
                                         ${project.build.directory}/crossdata-dist-${project.parent.version}/lib/com/stratio/crossdata/crossdata-driver_${scala.binary.version}/${project.parent.version}
                                     </from>
-                                    <to>/opt/sds/crossdata/lib</to>
+                                    <to>/opt/sds/crossdata/lib/shell</to>
                                 </copyDirectory>
                                 <copyDirectory>
                                     <from>
diff --git a/dist/src/main/resources/server/crossdata-env.sh b/dist/src/main/resources/server/crossdata-env.sh
index d5f289926..63d2d56d5 100755
--- a/dist/src/main/resources/server/crossdata-env.sh
+++ b/dist/src/main/resources/server/crossdata-env.sh
@@ -12,7 +12,7 @@ if [ -z $CROSSDATA_LOGS ];then
 	CROSSDATA_LOGS=$(pwd)
 fi 
 # CROSSDATA_LIB
-CROSSDATA_LIB="${CROSSDATA_HOME}/lib"
+CROSSDATA_LIB="${CROSSDATA_HOME}/lib/server"
 # CROSSDATA_BIN
 CROSSDATA_BIN="${CROSSDATA_HOME}/bin"
 # CROSSDATA_LOG_OUT
diff --git a/dist/src/main/resources/server/server-application.conf b/dist/src/main/resources/server/server-application.conf
index 34e1c6345..5dc18771f 100755
--- a/dist/src/main/resources/server/server-application.conf
+++ b/dist/src/main/resources/server/server-application.conf
@@ -41,7 +41,7 @@
 #crossdata-server.config.spark.app.name = "CrossdataServer"
 #crossdata-server.config.spark.master = "local[*]"
 #crossdata-server.config.spark.akka.heartbeat.interval = 5000
-#crossdata-server.config.spark.jars =  "/opt/sds/crossdata/lib/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
+#crossdata-server.config.spark.jars =  "/opt/sds/crossdata/lib/server/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
 #crossdata-server.config.spark.driver.maxResultSize = 1G
 #crossdata-server.config.spark.scheduler.mode = "FAIR"
 
diff --git a/dist/src/main/resources/shell/crossdata-env.sh b/dist/src/main/resources/shell/crossdata-env.sh
index 80be087f6..e7a61f5bf 100755
--- a/dist/src/main/resources/shell/crossdata-env.sh
+++ b/dist/src/main/resources/shell/crossdata-env.sh
@@ -11,7 +11,7 @@ if [ -z $CROSSDATA_SHELL_LOGS ];then
 	CROSSDATA_SHELL_LOGS=$(pwd)
 fi 
 # CROSSDATA_LIB
-CROSSDATA_SHELL_LIB="${CROSSDATA_SHELL_HOME}/lib"
+CROSSDATA_SHELL_LIB="${CROSSDATA_SHELL_HOME}/lib/shell"
 
 # CROSSDATA_BIN
 CROSSDATA_SHELL_BIN="${CROSSDATA_SHELL_HOME}/bin"
diff --git a/driver/pom.xml b/driver/pom.xml
index a3060f39c..747cdf62d 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -112,7 +112,7 @@
                                     <include>io.netty:netty</include>
                                     <include>org.slf4j:slf4j-api</include>
                                     <include>org.slf4j:slf4j-log4j12</include>
-                                    <include>log4j:log4j:jar</include>
+                                    <include>log4j:log4j</include>
                                     <include>org.scala-lang:scala-library</include>
                                     <include>org.scala-lang:scala-reflect</include>
                                     <include>org.scala-lang:scala-compiler</include>
@@ -273,28 +273,36 @@
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
-                            <minimizeJar>true</minimizeJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>com.stratio.crossdata:crossdata-common_${scala.binary.version}</include>
-                                    <include>com.stratio.crossdata:crossdata-driver_${scala.binary.version}</include>
-                                    <include>org.apache.spark:spark-catalyst_${scala.binary.version}</include>
-                                    <include>com.typesafe.akka:akka-actor_${scala.binary.version}</include>
-                                    <include>com.typesafe.akka:akka-cluster_${scala.binary.version}</include>
-                                    <include>com.typesafe.akka:akka-contrib_${scala.binary.version}</include>
-                                    <include>com.typesafe.akka:akka-remote_${scala.binary.version}</include>
-                                    <include>com.typesafe.akka:akka-slf4j_${scala.binary.version}</include>
-                                    <include>com.google.guava:guava</include>
-                                    <include>io.netty:netty-all</include>
-                                    <include>io.netty:netty</include>
-                                    <include>log4j:log4j:jar</include>
-                                    <include>org.scala-lang:scala-library</include>
-                                    <include>org.scala-lang:scala-reflect</include>
-                                    <include>org.scala-lang:scala-compiler</include>
-                                    <include>org.scala-lang:scalap</include>
-                                    <include>jline:jline</include>
-                                </includes>
-                            </artifactSet>
+                            <minimizeJar>false</minimizeJar>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>reference.conf</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>
+                                        META-INF/services/com.stratio.crossdata.connector.FunctionInventory
+                                    </resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>
+                                        META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
+                                    </resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf
index ea80a019b..fd5eebf8a 100644
--- a/server/src/main/resources/server-reference.conf
+++ b/server/src/main/resources/server-reference.conf
@@ -60,7 +60,7 @@ crossdata-server.config.spark.app.name = "CrossdataServer"
 crossdata-server.config.spark.master = "local[*]"
 crossdata-server.config.spark.master = ${?CROSSDATA_SERVER_CONFIG_SPARK_MASTER}
 crossdata-server.config.spark.akka.heartbeat.interval = 5000
-crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
+crossdata-server.config.spark.jars = "/opt/sds/crossdata/lib/server/crossdata-server_${scala.binary.version}-${project.version}-jar-with-dependencies.jar"
 crossdata-server.config.spark.jars = ${?CROSSDATA_SERVER_CONFIG_SPARK_JARS}
 crossdata-server.config.spark.driver.maxResultSize = 1G
 crossdata-server.config.spark.driver.maxResultSize = ${?CROSSDATA_SERVER_CONFIG_SPARK_DRIVER_MAXRESULTSIZE}