diff --git a/extensions/wikidata/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar b/extensions/wikidata/lib-local-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
similarity index 100%
rename from extensions/wikidata/lib-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
rename to extensions/wikidata/lib-local-src/wdtk-datamodel-0.9.0-SNAPSHOT-sources.jar
diff --git a/extensions/wikidata/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar b/extensions/wikidata/lib-local-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
similarity index 100%
rename from extensions/wikidata/lib-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
rename to extensions/wikidata/lib-local-src/wdtk-wikibaseapi-0.9.0-SNAPSHOT-sources.jar
diff --git a/extensions/wikidata/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar b/extensions/wikidata/lib-local/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
similarity index 100%
rename from extensions/wikidata/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
rename to extensions/wikidata/lib-local/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar
diff --git a/extensions/wikidata/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar b/extensions/wikidata/lib-local/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
similarity index 100%
rename from extensions/wikidata/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
rename to extensions/wikidata/lib-local/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar
diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml
index b6850ede0..3e377b785 100644
--- a/extensions/wikidata/pom.xml
+++ b/extensions/wikidata/pom.xml
@@ -104,7 +104,7 @@
                 <id>install-wdtk-datamodel</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar</file>
+                    <file>${basedir}/lib-local/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>org.wikidata.wdtk</groupId>
                     <artifactId>wdtk-datamodel</artifactId>
@@ -120,7 +120,7 @@
                 <id>install-wdtk-wikibaseapi</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar</file>
+                    <file>${basedir}/lib-local/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>org.wikidata.wdtk</groupId>
                     <artifactId>wdtk-wikibaseapi</artifactId>
diff --git a/main/lib-src/arithcode-1.1-sources.jar b/main/lib-local-src/arithcode-1.1-sources.jar
similarity index 100%
rename from main/lib-src/arithcode-1.1-sources.jar
rename to main/lib-local-src/arithcode-1.1-sources.jar
diff --git a/main/lib-src/butterfly-1.0.1-sources.jar b/main/lib-local-src/butterfly-1.0.1-sources.jar
similarity index 100%
rename from main/lib-src/butterfly-1.0.1-sources.jar
rename to main/lib-local-src/butterfly-1.0.1-sources.jar
diff --git a/main/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar b/main/lib-local-src/datapackage-java-1.0-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/datapackage-java-1.0-SNAPSHOT-sources.jar
rename to main/lib-local-src/datapackage-java-1.0-SNAPSHOT-sources.jar
diff --git a/main/lib-src/opencsv-2.4-SNAPSHOT-sources.jar b/main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/opencsv-2.4-SNAPSHOT-sources.jar
rename to main/lib-local-src/opencsv-2.4-SNAPSHOT-sources.jar
diff --git a/main/lib-src/patches/json-20100208.patch b/main/lib-local-src/patches/json-20100208.patch
similarity index 100%
rename from main/lib-src/patches/json-20100208.patch
rename to main/lib-local-src/patches/json-20100208.patch
diff --git a/main/lib-src/secondstring-20100303-sources.jar b/main/lib-local-src/secondstring-20100303-sources.jar
similarity index 100%
rename from main/lib-src/secondstring-20100303-sources.jar
rename to main/lib-local-src/secondstring-20100303-sources.jar
diff --git a/main/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar b/main/lib-local-src/tableschema-java-1.0-SNAPSHOT-sources.jar
similarity index 100%
rename from main/lib-src/tableschema-java-1.0-SNAPSHOT-sources.jar
rename to main/lib-local-src/tableschema-java-1.0-SNAPSHOT-sources.jar
diff --git a/main/lib-src/vicino-1.1-sources.jar b/main/lib-local-src/vicino-1.1-sources.jar
similarity index 100%
rename from main/lib-src/vicino-1.1-sources.jar
rename to main/lib-local-src/vicino-1.1-sources.jar
diff --git a/main/lib/arithcode-1.1.jar b/main/lib-local/arithcode-1.1.jar
similarity index 100%
rename from main/lib/arithcode-1.1.jar
rename to main/lib-local/arithcode-1.1.jar
diff --git a/main/lib/butterfly-1.0.1.jar b/main/lib-local/butterfly-1.0.1.jar
similarity index 100%
rename from main/lib/butterfly-1.0.1.jar
rename to main/lib-local/butterfly-1.0.1.jar
diff --git a/main/lib/datapackage-java-1.0-SNAPSHOT.jar b/main/lib-local/datapackage-java-1.0-SNAPSHOT.jar
similarity index 100%
rename from main/lib/datapackage-java-1.0-SNAPSHOT.jar
rename to main/lib-local/datapackage-java-1.0-SNAPSHOT.jar
diff --git a/main/lib/marc4j-2.4.jar b/main/lib-local/marc4j-2.4.jar
similarity index 100%
rename from main/lib/marc4j-2.4.jar
rename to main/lib-local/marc4j-2.4.jar
diff --git a/main/lib/opencsv-2.4-SNAPSHOT.jar b/main/lib-local/opencsv-2.4-SNAPSHOT.jar
similarity index 100%
rename from main/lib/opencsv-2.4-SNAPSHOT.jar
rename to main/lib-local/opencsv-2.4-SNAPSHOT.jar
diff --git a/main/lib/secondstring-20100303.jar b/main/lib-local/secondstring-20100303.jar
similarity index 100%
rename from main/lib/secondstring-20100303.jar
rename to main/lib-local/secondstring-20100303.jar
diff --git a/main/lib/tableschema-java-1.0-SNAPSHOT.jar b/main/lib-local/tableschema-java-1.0-SNAPSHOT.jar
similarity index 100%
rename from main/lib/tableschema-java-1.0-SNAPSHOT.jar
rename to main/lib-local/tableschema-java-1.0-SNAPSHOT.jar
diff --git a/main/lib/vicino-1.1.jar b/main/lib-local/vicino-1.1.jar
similarity index 100%
rename from main/lib/vicino-1.1.jar
rename to main/lib-local/vicino-1.1.jar
diff --git a/main/pom.xml b/main/pom.xml
index d3837c37f..b0b03c2c3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -126,7 +126,7 @@
                 <id>install-marc4j</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/marc4j-2.4.jar</file>
+                    <file>${basedir}/lib-local/marc4j-2.4.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>marc4j</groupId>
                     <artifactId>marc4j</artifactId>
@@ -142,7 +142,7 @@
                 <id>install-tableschema</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/tableschema-java-1.0-SNAPSHOT.jar</file>
+                    <file>${basedir}/lib-local/tableschema-java-1.0-SNAPSHOT.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>io.frictionlessdata</groupId>
                     <artifactId>tableschema-java</artifactId>
@@ -158,7 +158,7 @@
                 <id>install-datapackage</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/datapackage-java-1.0-SNAPSHOT.jar</file>
+                    <file>${basedir}/lib-local/datapackage-java-1.0-SNAPSHOT.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>io.frictionlessdata</groupId>
                     <artifactId>datapackage-java</artifactId>
@@ -174,7 +174,7 @@
                 <id>install-opencsv</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/opencsv-2.4-SNAPSHOT.jar</file>
+                    <file>${basedir}/lib-local/opencsv-2.4-SNAPSHOT.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>net.sf.opencsv</groupId>
                     <artifactId>opencsv</artifactId>
@@ -190,7 +190,7 @@
                 <id>install-butterfly</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/butterfly-1.0.1.jar</file>
+                    <file>${basedir}/lib-local/butterfly-1.0.1.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>edu.mit.simile</groupId>
                     <artifactId>butterfly</artifactId>
@@ -206,7 +206,7 @@
                 <id>install-vicino</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/vicino-1.1.jar</file>
+                    <file>${basedir}/lib-local/vicino-1.1.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>edu.mit.simile</groupId>
                     <artifactId>vicino</artifactId>
@@ -222,7 +222,7 @@
                 <id>install-secondstring</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/secondstring-20100303.jar</file>
+                    <file>${basedir}/lib-local/secondstring-20100303.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>com.wcohen</groupId>
                     <artifactId>secondstring</artifactId>
@@ -238,7 +238,7 @@
                 <id>install-arithcode</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/arithcode-1.1.jar</file>
+                    <file>${basedir}/lib-local/arithcode-1.1.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>com.colloquial</groupId>
                     <artifactId>arithcode</artifactId>
diff --git a/packaging/linux.xml b/packaging/linux.xml
index 2556b5093..3409c4dbc 100644
--- a/packaging/linux.xml
+++ b/packaging/linux.xml
@@ -20,6 +20,11 @@
       <excludes>
 	<exclude>**/*.java</exclude>
 	<exclude>**/butterfly.properties</exclude>
+        <exclude>**/lib-local/**</exclude>
+        <exclude>*/lib-local-src/**</exclude>
+	<exclude>**/pom.xml</exclude>
+	<exclude>**/.settings/**</exclude>
+	<exclude>**/.project</exclude>
       </excludes>
     </fileSet>
     <fileSet>
@@ -45,6 +50,8 @@
 	<exclude>**/pom.xml</exclude>
 	<exclude>**/.settings/**</exclude>
 	<exclude>**/.project</exclude>
+        <exclude>**/lib-local/**</exclude>
+        <exclude>*/lib-local-src/**</exclude>
       </excludes>
     </fileSet>
   </fileSets>
diff --git a/packaging/windows.xml b/packaging/windows.xml
index 4223d67f4..8914f247b 100644
--- a/packaging/windows.xml
+++ b/packaging/windows.xml
@@ -14,7 +14,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${rootdir}/server/lib/native</directory>
+      <directory>${rootdir}/server/lib-local/native</directory>
       <outputDirectory>server/target/lib/native</outputDirectory>
       <includes>
 	<include>**/*.dll</include>
@@ -27,6 +27,11 @@
       <excludes>
 	<exclude>**/*.java</exclude>
 	<exclude>**/butterfly.properties</exclude>
+        <exclude>**/lib-local/**</exclude>
+        <exclude>*/lib-local-src/**</exclude>
+	<exclude>**/pom.xml</exclude>
+	<exclude>**/.settings/**</exclude>
+	<exclude>**/.project</exclude>
       </excludes>
     </fileSet>
     <fileSet>
@@ -52,6 +57,8 @@
 	<exclude>**/pom.xml</exclude>
 	<exclude>**/.settings/**</exclude>
 	<exclude>**/.project</exclude>
+        <exclude>**/lib-local/**</exclude>
+        <exclude>*/lib-local-src/**</exclude>
       </excludes>
     </fileSet>
   </fileSets>
diff --git a/server/lib-src/jdatapath-alpha2-sources.jar b/server/lib-local-src/jdatapath-alpha2-sources.jar
similarity index 100%
rename from server/lib-src/jdatapath-alpha2-sources.jar
rename to server/lib-local-src/jdatapath-alpha2-sources.jar
diff --git a/server/lib/jdatapath-alpha2.jar b/server/lib-local/jdatapath-alpha2.jar
similarity index 100%
rename from server/lib/jdatapath-alpha2.jar
rename to server/lib-local/jdatapath-alpha2.jar
diff --git a/server/lib/native/windows/jdatapath.dll b/server/lib-local/native/windows/jdatapath.dll
similarity index 100%
rename from server/lib/native/windows/jdatapath.dll
rename to server/lib-local/native/windows/jdatapath.dll
diff --git a/server/pom.xml b/server/pom.xml
index 95a529a5d..cf3c18344 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -90,7 +90,7 @@
                 <id>install-jdapath</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib/jdatapath-alpha2.jar</file>
+                    <file>${basedir}/lib-local/jdatapath-alpha2.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>com.codeberry.jdatapath</groupId>
                     <artifactId>jdatapath</artifactId>