diff --git a/.classpath b/.classpath
index 32d8ef3..89ea36d 100644
--- a/.classpath
+++ b/.classpath
@@ -3,11 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.11.jar" sourcepath="lib/junit-4.11-sources.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.8.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
@@ -22,9 +17,14 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/mysql-jdbc-5.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/joda-time-2.3.jar" sourcepath="lib/joda-time-2.3-sources.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb-2.3.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4-sources.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.4.jar" sourcepath="lib/commons-io-2.4-sources.jar"/>
 	<classpathentry kind="lib" path="lib/devinsy-utils-0.3.3.jar" sourcepath="lib/devinsy-utils-0.3.3-sources.zip"/>
+	<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.5.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.5.jar"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11.jar"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/hsqldb-2.3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/log4j-1.2.17-source.zip b/lib/Logs/log4j-1.2.17-source.zip
similarity index 100%
rename from lib/log4j-1.2.17-source.zip
rename to lib/Logs/log4j-1.2.17-source.zip
diff --git a/lib/log4j-1.2.17.jar b/lib/Logs/log4j-1.2.17.jar
similarity index 100%
rename from lib/log4j-1.2.17.jar
rename to lib/Logs/log4j-1.2.17.jar
diff --git a/lib/slf4j-api-1.7.5-sources.jar b/lib/Logs/slf4j-api-1.7.5-sources.jar
similarity index 100%
rename from lib/slf4j-api-1.7.5-sources.jar
rename to lib/Logs/slf4j-api-1.7.5-sources.jar
diff --git a/lib/slf4j-api-1.7.5.jar b/lib/Logs/slf4j-api-1.7.5.jar
similarity index 100%
rename from lib/slf4j-api-1.7.5.jar
rename to lib/Logs/slf4j-api-1.7.5.jar
diff --git a/lib/slf4j-log4j12-1.7.5-sources.jar b/lib/Logs/slf4j-log4j12-1.7.5-sources.jar
similarity index 100%
rename from lib/slf4j-log4j12-1.7.5-sources.jar
rename to lib/Logs/slf4j-log4j12-1.7.5-sources.jar
diff --git a/lib/slf4j-log4j12-1.7.5.jar b/lib/Logs/slf4j-log4j12-1.7.5.jar
similarity index 100%
rename from lib/slf4j-log4j12-1.7.5.jar
rename to lib/Logs/slf4j-log4j12-1.7.5.jar
diff --git a/lib/README b/lib/README
index b9ab066..fb405f0 100644
--- a/lib/README
+++ b/lib/README
@@ -1,9 +1,15 @@
 Description of used libraries:
-- commons-codec: digest tools
-- commons-lang: useful tools (StringUtils...)
-- hamcrest-core: required by junit
-- hsqldb: SQL Database  for unit test.
-- junit: unit tests API
-- log4j: log API
-- slf4j-api: facade log API
-- slf4j-log4j12: adaptation layer between slf4j and log4j
+
+- Logs/
+    - log4j             log API
+    - slf4j-api         facade log API
+    - slf4j-log4j12     adaptation layer between slf4j and log4j
+    
+- UnitTesting/
+    - hamcrest-core     required by junit
+    - hsqldb            SQL Database  for unit test.
+    - junit             unit tests API
+
+- other:
+    - commons-codec     digest tools
+    - commons-lang      useful tools (StringUtils...)
diff --git a/lib/hamcrest-core-1.3-sources.jar b/lib/UnitTesting/hamcrest-core-1.3-sources.jar
similarity index 100%
rename from lib/hamcrest-core-1.3-sources.jar
rename to lib/UnitTesting/hamcrest-core-1.3-sources.jar
diff --git a/lib/hamcrest-core-1.3.jar b/lib/UnitTesting/hamcrest-core-1.3.jar
similarity index 100%
rename from lib/hamcrest-core-1.3.jar
rename to lib/UnitTesting/hamcrest-core-1.3.jar
diff --git a/lib/hsqldb-2.3.0.jar b/lib/UnitTesting/hsqldb-2.3.0.jar
similarity index 100%
rename from lib/hsqldb-2.3.0.jar
rename to lib/UnitTesting/hsqldb-2.3.0.jar
diff --git a/lib/junit-4.11-sources.jar b/lib/UnitTesting/junit-4.11-sources.jar
similarity index 100%
rename from lib/junit-4.11-sources.jar
rename to lib/UnitTesting/junit-4.11-sources.jar
diff --git a/lib/junit-4.11.jar b/lib/UnitTesting/junit-4.11.jar
similarity index 100%
rename from lib/junit-4.11.jar
rename to lib/UnitTesting/junit-4.11.jar