diff --git a/.gitignore b/.gitignore
index 10e6736..ab999ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+**/lib/
 target/
 output/
 build/cli/
diff --git a/.travis.yml b/.travis.yml
index 4703a4e..1a04464 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
   - wget https://github.com/CloudSlang/cloud-slang/releases/download/cloudslang-1.0.9/cslang-builder.zip
   - unzip -q cslang-builder.zip
   - chmod +x cslang-builder/bin/cslang-builder
-  - ./cslang-builder/bin/cslang-builder -cr src/main/slang -pr src -ts src/test/slang -ts \!default,couchbase -cov -des -cs
+  - ./cslang-builder/bin/cslang-builder -cr src/main/library -pr src -ts src/test/library -ts \!default,couchbase -cov -des -cs
 
 after_success:
   - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter --projectToken ${codacyToken} -l Java -r cobertura.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aed2a83..d73fbd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # io.cloudslang.content:cs-couchbase v0.1.1-SNAPSHOT git changelog
 
+
+**cs-couchbase-0.1.1-RC17**  
+**cs-couchbase-0.1.1-RC16**  
+2017-11-08 09:10:06 +0200    POM.xml cleanup (moldovso)  
+
+**cs-couchbase-0.1.1-RC15**  
+**cs-couchbase-0.1.1-RC14**  
+**cs-couchbase-0.1.1-RC13**  
+2017-11-07 16:36:52 +0200    Double sources fix (moldovso)  
+
+**cs-couchbase-0.1.1-RC12**  
+**cs-couchbase-0.1.1-RC11**  
+2017-11-07 16:27:34 +0200    Added internal release profile (moldovso)  
+
+**cs-couchbase-0.1.1-RC8**  
+**cs-couchbase-0.1.1-RC7**  
+**cs-couchbase-0.1.1-RC6**  
+**cs-couchbase-0.1.1-RC4**  
+**cs-couchbase-0.1.1-RC3**  
+**cs-couchbase-0.1.1-RC2**  
+**cs-couchbase-0.1.1-RC1**  
+2017-10-26 20:53:50 +0300    Temporary gitlog plugin disable (moldovso)  
+2017-10-26 02:39:55 +0300    Update logic in pom file (Sorin Moldovan)  
 2017-10-24 16:14:14 +0300    Test webhooks (moldovso)  
 2017-10-24 16:06:56 +0300    Update packages to latest version available. (moldovso)  
 2017-10-24 15:08:26 +0300    Implement automatic dependency analyzer (moldovso)  
diff --git a/pom.xml b/pom.xml
index 22dafee..81646d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?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">
+<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">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -188,8 +190,8 @@
                                 <includeEmptyDirs>false</includeEmptyDirs>
                                 <resources>
                                     <resource>
-                                        <targetPath>slang</targetPath>
-                                        <directory>/src/main/slang</directory>
+                                        <targetPath>../library</targetPath>
+                                        <directory>/src/main/library</directory>
                                         <filtering>false</filtering>
                                     </resource>
                                 </resources>
@@ -250,28 +252,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-            <groupId>com.github.danielflower.mavenplugins</groupId>
-            <artifactId>gitlog-maven-plugin</artifactId>
-            <version>1.13.3</version>
-            <executions>
-            <execution>
-            <goals>
-            <goal>generate</goal>
-            </goals>
-            </execution>
-            </executions>
-            <configuration>
-            <outputDirectory>${project.basedir}</outputDirectory>
-            <fullGitMessage>false</fullGitMessage>
-            <issueManagementUrl>https://github.com/CloudSlang/cs-couchbase/issues</issueManagementUrl>
-            <generatePlainTextChangeLog>false</generatePlainTextChangeLog>
-            <generateSimpleHTMLChangeLog>false</generateSimpleHTMLChangeLog>
-            <generateJSONChangeLog>false</generateJSONChangeLog>
-            <generateMarkdownChangeLog>true</generateMarkdownChangeLog>
-            <markdownChangeLogFilename>CHANGELOG.md</markdownChangeLogFilename>
-            </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -300,6 +280,51 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>deploy-cp</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-dependencies</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <copyPom>true</copyPom>
+                                    <useRepositoryLayout>true</useRepositoryLayout>
+                                    <excludeTransitive>false</excludeTransitive>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>dist</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src${file.separator}main${file.separator}resources${file.separator}package.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+                <finalName>${project.artifactId}</finalName>
+            </build>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file
diff --git a/src/main/slang/io/cloudslang/content/couchbase/buckets/create_or_edit_bucket.sl b/src/main/library/io/cloudslang/content/couchbase/buckets/create_or_edit_bucket.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/buckets/create_or_edit_bucket.sl
rename to src/main/library/io/cloudslang/content/couchbase/buckets/create_or_edit_bucket.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/buckets/delete_bucket.sl b/src/main/library/io/cloudslang/content/couchbase/buckets/delete_bucket.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/buckets/delete_bucket.sl
rename to src/main/library/io/cloudslang/content/couchbase/buckets/delete_bucket.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/buckets/get_all_buckets.sl b/src/main/library/io/cloudslang/content/couchbase/buckets/get_all_buckets.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/buckets/get_all_buckets.sl
rename to src/main/library/io/cloudslang/content/couchbase/buckets/get_all_buckets.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/buckets/get_bucket.sl b/src/main/library/io/cloudslang/content/couchbase/buckets/get_bucket.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/buckets/get_bucket.sl
rename to src/main/library/io/cloudslang/content/couchbase/buckets/get_bucket.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/buckets/get_bucket_statistics.sl b/src/main/library/io/cloudslang/content/couchbase/buckets/get_bucket_statistics.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/buckets/get_bucket_statistics.sl
rename to src/main/library/io/cloudslang/content/couchbase/buckets/get_bucket_statistics.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/cluster/get_cluster_details.sl b/src/main/library/io/cloudslang/content/couchbase/cluster/get_cluster_details.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/cluster/get_cluster_details.sl
rename to src/main/library/io/cloudslang/content/couchbase/cluster/get_cluster_details.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/cluster/get_cluster_info.sl b/src/main/library/io/cloudslang/content/couchbase/cluster/get_cluster_info.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/cluster/get_cluster_info.sl
rename to src/main/library/io/cloudslang/content/couchbase/cluster/get_cluster_info.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/cluster/rebalancing_nodes.sl b/src/main/library/io/cloudslang/content/couchbase/cluster/rebalancing_nodes.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/cluster/rebalancing_nodes.sl
rename to src/main/library/io/cloudslang/content/couchbase/cluster/rebalancing_nodes.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/nodes/fail_over_node.sl b/src/main/library/io/cloudslang/content/couchbase/nodes/fail_over_node.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/nodes/fail_over_node.sl
rename to src/main/library/io/cloudslang/content/couchbase/nodes/fail_over_node.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/nodes/graceful_fail_over_node.sl b/src/main/library/io/cloudslang/content/couchbase/nodes/graceful_fail_over_node.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/nodes/graceful_fail_over_node.sl
rename to src/main/library/io/cloudslang/content/couchbase/nodes/graceful_fail_over_node.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/nodes/set_recovery_type.sl b/src/main/library/io/cloudslang/content/couchbase/nodes/set_recovery_type.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/nodes/set_recovery_type.sl
rename to src/main/library/io/cloudslang/content/couchbase/nodes/set_recovery_type.sl
diff --git a/src/main/slang/io/cloudslang/content/couchbase/views/get_design_docs_info.sl b/src/main/library/io/cloudslang/content/couchbase/views/get_design_docs_info.sl
similarity index 100%
rename from src/main/slang/io/cloudslang/content/couchbase/views/get_design_docs_info.sl
rename to src/main/library/io/cloudslang/content/couchbase/views/get_design_docs_info.sl
diff --git a/src/main/resources/package.xml b/src/main/resources/package.xml
new file mode 100644
index 0000000..e56eb90
--- /dev/null
+++ b/src/main/resources/package.xml
@@ -0,0 +1,43 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>cp-${project.version}</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>target/library</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>Content/Library</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/lib</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <outputDirectory>Lib</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <excludes>
+                <exclude>**/*.xml</exclude>
+            </excludes>
+            <outputDirectory>Actions</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/classes</directory>
+            <includes>
+                <include>**/pom.xml</include>
+            </includes>
+            <outputDirectory>.</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/resources/pom.xml b/src/main/resources/pom.xml
new file mode 100644
index 0000000..8865608
--- /dev/null
+++ b/src/main/resources/pom.xml
@@ -0,0 +1,18 @@
+<?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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cs-dependencies</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.cloudslang.content</groupId>
+            <artifactId>cs-base</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/src/test/slang/io/cloudslang/content/couchbase/views/get_design_docs_info.inputs.yaml b/src/test/library/io/cloudslang/content/couchbase/views/get_design_docs_info.inputs.yaml
similarity index 100%
rename from src/test/slang/io/cloudslang/content/couchbase/views/get_design_docs_info.inputs.yaml
rename to src/test/library/io/cloudslang/content/couchbase/views/get_design_docs_info.inputs.yaml