diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 2fc2922..a0cf0a9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="DEPLOY_AFTER_MAKE" value="0" />
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
       <entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -24,33 +23,8 @@
     <annotationProcessing enabled="false" useClasspath="true" />
   </component>
   <component name="EclipseCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
     <option name="GENERATE_NO_WARNINGS" value="true" />
     <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="JikesSettings">
-    <option name="JIKES_PATH" value="" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="RmicSettings">
-    <option name="IS_EANABLED" value="false" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_IIOP_STUBS" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
 </project>
 
diff --git a/.idea/libraries/corelib.xml b/.idea/libraries/corelib.xml
deleted file mode 100644
index 6caa13e..0000000
--- a/.idea/libraries/corelib.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="corelib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.core/vendor/lib/commons-io-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.core/vendor/lib/hsqldb.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.core/vendor/lib/dbdeploy-ant-3.0M1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.core/vendor/lib/joda-time-1.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.core/vendor/lib/picocontainer-2.8.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/swingclientlib.xml b/.idea/libraries/swingclientlib.xml
deleted file mode 100644
index 4c85cb2..0000000
--- a/.idea/libraries/swingclientlib.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="swingclientlib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.swingclient/vendor/lib/AppFramework.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.swingclient/vendor/lib/binding-2.0.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/org.netmelody.docnap.swingclient/vendor/lib/forms-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8d08e9b..a16fa2e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -23,7 +23,7 @@
   <component name="ProjectDetails">
     <option name="projectName" value="docnap" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="jdk1.6.0_14" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
diff --git a/.idea/projectCodeStyle.xml b/.idea/projectCodeStyle.xml
index f4bd91d..ba9e2bf 100644
--- a/.idea/projectCodeStyle.xml
+++ b/.idea/projectCodeStyle.xml
@@ -22,6 +22,15 @@
         <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
         <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
         <option name="JD_P_AT_EMPTY_LINES" value="false" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="clj">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
           <option name="INDENT_SIZE" value="2" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
diff --git a/org.netmelody.docnap.core/Org.netmelody.docnap.core.iml b/org.netmelody.docnap.core/Org.netmelody.docnap.core.iml
index 842546a..769a721 100644
--- a/org.netmelody.docnap.core/Org.netmelody.docnap.core.iml
+++ b/org.netmelody.docnap.core/Org.netmelody.docnap.core.iml
@@ -9,17 +9,31 @@
       <sourceFolder url="file://$MODULE_DIR$/unittest" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library" exported="" scope="RUNTIME">
+      <library name="lib">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendorsrc" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/vendor/lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" scope="TEST">
-      <library>
+    <orderEntry type="module-library" exported="">
+      <library name="buildlib">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/vendor/buildlib/junit-4.7.jar!/" />
+          <root url="file://$MODULE_DIR$/vendor/buildlib" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendorsrc" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/vendor/buildlib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="corelib" level="project" />
   </component>
 </module>
 
diff --git a/org.netmelody.docnap.swingclient/Org.netmelody.docnap.swingclient.iml b/org.netmelody.docnap.swingclient/Org.netmelody.docnap.swingclient.iml
index ddc79a7..073e2af 100644
--- a/org.netmelody.docnap.swingclient/Org.netmelody.docnap.swingclient.iml
+++ b/org.netmelody.docnap.swingclient/Org.netmelody.docnap.swingclient.iml
@@ -8,10 +8,32 @@
       <sourceFolder url="file://$MODULE_DIR$/acceptancetest" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="module" module-name="Org.netmelody.docnap.core" scope="RUNTIME" />
+    <orderEntry type="module-library" scope="RUNTIME">
+      <library name="lib">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendorsrc" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/vendor/lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="swingclientlib" level="project" />
-    <orderEntry type="library" name="corelib" level="project" />
-    <orderEntry type="module" module-name="Org.netmelody.docnap.core" />
+    <orderEntry type="module-library">
+      <library name="buildlib">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/buildlib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendorsrc" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/vendor/buildlib" recursive="false" />
+      </library>
+    </orderEntry>
   </component>
 </module>