diff --git a/Contributors b/Contributors
index 652dea0..2d3b170 100644
--- a/Contributors
+++ b/Contributors
@@ -1,8 +1,26 @@
-Caya is brought to you by:
+Caya contributors list
+======================
 
-* Andrea Anzani
-* Pier Luigi Fiorini
+If you are not in this list, just send us an email.
+We will add you!
 
-Other contributors:
+== Core developers ==
 
-* Alexander Botero-Lowry (aim protocol add-on)
+  Caya is brought to you buy:
+
+    * Andrea Anzani
+    * Pier Luigi Fiorini
+
+== Code ==
+
+  Contributors in alphabetical order by last name:
+
+    * Alexander Botero-Lowry (aim protocol add-on)
+
+== Icons ==
+
+  Michele Frau created the following HVIF icons:
+
+    * AIM protocol
+    * ICQ protocol
+    * GoogleTalk protocol
diff --git a/License b/License
new file mode 100644
index 0000000..e797c5b
--- /dev/null
+++ b/License
@@ -0,0 +1,26 @@
+Copyright (c) 2009-2010, Andrea Anzani
+Copyright (c) 2009-2010, Pier Luigi Fiorini
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1.	Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+2.	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+3.	The name of the author may not be used to endorse or promote
+	products derived from this software without specific prior written
+	permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/libimcomm/COPYING b/libs/libimcomm/License
similarity index 100%
rename from libs/libimcomm/COPYING
rename to libs/libimcomm/License