diff --git a/.idea/libraries/http_client_3_1.xml b/.idea/libraries/http_client_3_1.xml
index 7062b0917c3b..0ea3b49397cf 100644
--- a/.idea/libraries/http_client_3_1.xml
+++ b/.idea/libraries/http_client_3_1.xml
@@ -1,12 +1,15 @@
 <component name="libraryTable">
   <library name="http-client-3.1">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/tasks/tasks-core/lib/commons-httpclient-3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/tasks/tasks-core/lib/commons-logging-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-httpclient-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/plugins/tasks/tasks-core/lib/commons-httpclient-3.1-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/commons-httpclient-3.1-src.zip!/" />
     </JAVADOC>
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/commons-httpclient-3.1-src.zip!/commons-httpclient-3.1/src/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/commons-httpclient-3.1-src.zip!/commons-httpclient-3.1/src/contrib" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/plugins/tasks/tasks-core/lib/commons-httpclient-3.1.jar b/lib/commons-httpclient-3.1.jar
similarity index 100%
rename from plugins/tasks/tasks-core/lib/commons-httpclient-3.1.jar
rename to lib/commons-httpclient-3.1.jar
diff --git a/plugins/tasks/tasks-core/lib/commons-logging-1.1.1.jar b/lib/commons-logging-1.1.1.jar
similarity index 100%
rename from plugins/tasks/tasks-core/lib/commons-logging-1.1.1.jar
rename to lib/commons-logging-1.1.1.jar
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index add69795500e..339fa2755293 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -10,7 +10,9 @@ coverage-report.jar
 coverage-report-idea.jar
 commons-codec-1.3.jar
 commons-collections.jar
+commons-httpclient-3.1.jar
 commons-lang-2.4.jar
+commons-logging-1.1.1.jar
 emma.jar
 freemarker.jar
 jdom.jar
diff --git a/plugins/tasks/tasks-core/lib/commons-httpclient-3.1-src.zip b/lib/src/commons-httpclient-3.1-src.zip
similarity index 100%
rename from plugins/tasks/tasks-core/lib/commons-httpclient-3.1-src.zip
rename to lib/src/commons-httpclient-3.1-src.zip