diff --git a/class/Blogs.php b/class/Blogs.php
index 5514b69..f6d4caf 100644
--- a/class/Blogs.php
+++ b/class/Blogs.php
@@ -14,7 +14,7 @@ class blogs {
 				<ul>';
 		$blogs = new Blogs_last_post();
 		foreach($blogs->getLinks() as $link)
-			echo '<li>'.$link['url'].' <img src="images/delete.png" id="link-'.$link['name'].'"/></li>';
+			echo '<li>'.$link['url'].' <img src="images/interface/delete.png" id="link-'.$link['name'].'"/></li>';
 		echo '</ul>
 				<h4>Insert Site feed</h4>
 				<form action="addSite.php" method="POST">
diff --git a/class/Links.php b/class/Links.php
index 344a115..157fa58 100644
--- a/class/Links.php
+++ b/class/Links.php
@@ -7,42 +7,42 @@ class links {
 		echo '<div class="appscontainer"> 
 		<span class="label">Google Apps</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://mail.google.com" onclick="spawnLink(this);return false;"><img src="images/gmail_128.png" /><br>Gmail</a></li> 
-			<li class="item"><a href="http://mail.live.com" onclick="spawnLink(this);return false;"><img src="images/mail-msn.png" /><br>Hotmail</a></li> 
+			<li class="item"><a href="http://mail.google.com" onclick="spawnLink(this);return false;"><img src="images/links/gmail_128.png" /><br>Gmail</a></li> 
+			<li class="item"><a href="http://mail.live.com" onclick="spawnLink(this);return false;"><img src="images/links/mail-msn.png" /><br>Hotmail</a></li> 
 			<li class="item"><a href="http://mail1.voila.fr/webmail/fr_FR/login.html" onclick="spawnLink(this);return false;"><img src="images/voila.png" /><br>Voila.fr mail</a></li> 
-			<li class="item"><a href="http://calendar.google.com" onclick="spawnLink(this);return false;"><img src="images/calendar_128.png" /><br>Google&nbsp;Calendar</a></li> 
-			<li class="item"><a href="http://reader.google.com" onclick="spawnLink(this);return false;"><img src="images/reader_128.png" /><br>Google Reader</a></li>
-			<li class="item"><a href="http://docs.google.com" onclick="return spawnLink(this);"><img src="images/docs_128.png" /><br>Google Docs</a></li> 
+			<li class="item"><a href="http://calendar.google.com" onclick="spawnLink(this);return false;"><img src="images/links/calendar_128.png" /><br>Google&nbsp;Calendar</a></li> 
+			<li class="item"><a href="http://reader.google.com" onclick="spawnLink(this);return false;"><img src="images/links/reader_128.png" /><br>Google Reader</a></li>
+			<li class="item"><a href="http://docs.google.com" onclick="return spawnLink(this);"><img src="images/links/docs_128.png" /><br>Google Docs</a></li> 
 		</ul> 
 		<hr> 
  
 		<span class="label">Media</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://youtube.com" onclick="spawnLink(this);return false;"><img src="images/youtube_128.png" /><br>YouTube</a></li> 
-			<li class="item"><a href="http://picasaweb.com" onclick="spawnLink(this);return false;"><img src="images/picasaweb_128.png" /><br>PicasaWeb</a></li> 
-			<li class="item"><a href="http://www.netvibes.com" onclick="spawnLink(this);return false;"><img src="images/netvibes.png" /><br>Netvibes</a></li> 
-			<li class="item"><a href="http://www.deviantart.com" onclick="spawnLink(this);return false;"><img src="images/deviantART128.png" /><br>DeviantArt</a></li>
-			<li class="item"><a href="https://www.labanquepostale.fr/index.html" onclick="spawnLink(this);return false;"><img src="images/banquepostale.png" /><br>Banque 1</a></li>
-			<li class="item"><a href="http://www.societegenerale.fr/" onclick="spawnLink(this);return false;"><img src="images/societegenerale.png" /><br>Banque 2</a></li>			
+			<li class="item"><a href="http://youtube.com" onclick="spawnLink(this);return false;"><img src="images/links/youtube_128.png" /><br>YouTube</a></li> 
+			<li class="item"><a href="http://picasaweb.com" onclick="spawnLink(this);return false;"><img src="images/links/picasaweb_128.png" /><br>PicasaWeb</a></li> 
+			<li class="item"><a href="http://www.netvibes.com" onclick="spawnLink(this);return false;"><img src="images/links/netvibes.png" /><br>Netvibes</a></li> 
+			<li class="item"><a href="http://www.deviantart.com" onclick="spawnLink(this);return false;"><img src="images/links/deviantART128.png" /><br>DeviantArt</a></li>
+			<li class="item"><a href="https://www.labanquepostale.fr/index.html" onclick="spawnLink(this);return false;"><img src="images/links/banquepostale.png" /><br>Banque 1</a></li>
+			<li class="item"><a href="http://www.societegenerale.fr/" onclick="spawnLink(this);return false;"><img src="images/links/societegenerale.png" /><br>Banque 2</a></li>			
 		</ul> 
 		<hr> 
  
 		<span class="label">Desk Accessories</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="javascript: openContactList()" ><img src="images/contacts.png" /><br>Contacts</a></li> 
-			<li class="item"><a href="javascript: openCalculator();"><img src="images/calculator.png" width="16" height="16" /><br>Calculator</a></li> 
-			<li class="item"><a href="javascript: openTodo();"><img src="images/tasks.png" width="16" height="16" /><br>To-do list</a></li> 
-			<li class="item"><a href="javascript: openCalendar();"><img src="images/calendar_128.png" width="16" height="16" /><br>Calendar Panel</a></li> 
-            <li class="item"><a href="javascript: openNotepad();"><img src="images/notepad.png" width="16" height="16" /><br>NotePad</a></li>
+			<li class="item"><a href="javascript: openContactList()" ><img src="images/links/contacts.png" /><br>Contacts</a></li> 
+			<li class="item"><a href="javascript: openCalculator();"><img src="images/links/calculator.png" width="16" height="16" /><br>Calculator</a></li> 
+			<li class="item"><a href="javascript: openTodo();"><img src="images/links/tasks.png" width="16" height="16" /><br>To-do list</a></li> 
+			<li class="item"><a href="javascript: openCalendar();"><img src="images/links/calendar_128.png" width="16" height="16" /><br>Calendar Panel</a></li> 
+            <li class="item"><a href="javascript: openNotepad();"><img src="images/links/notepad.png" width="16" height="16" /><br>NotePad</a></li>
 		</ul> 
 		<hr> 
  
 		<span class="label">Entertainment</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://facebook.com" onclick="spawnLink(this);return false;"><img src="images/facebook.png" /><br>Facebook</a></li> 
-			<li class="item"><a href="http://twitter.com" onclick="spawnLink(this);return false;"><img src="images/twitter.png" />Twitter</a></li> 
-			<li class="item"><a href="http://fr.vente-privee.com/" onclick="spawnLink(this);return false;"><img src="images/vp128.png" />Ventes Privées</a></li>
-			<li class="item"><a href="http://www.google.fr/movies" onclick="spawnLink(this);return false;"><img src="images/Gmovie.png" />Horaires Ciné</a></li>			
+			<li class="item"><a href="http://facebook.com" onclick="spawnLink(this);return false;"><img src="images/links/facebook.png" /><br>Facebook</a></li> 
+			<li class="item"><a href="http://twitter.com" onclick="spawnLink(this);return false;"><img src="images/links/twitter.png" />Twitter</a></li> 
+			<li class="item"><a href="http://fr.vente-privee.com/" onclick="spawnLink(this);return false;"><img src="images/links/vp128.png" />Ventes Privées</a></li>
+			<li class="item"><a href="http://www.google.fr/movies" onclick="spawnLink(this);return false;"><img src="images/links/Gmovie.png" />Horaires Ciné</a></li>			
 			
 		</ul> 
 		<hr> 
diff --git a/class/Search.php b/class/Search.php
index 19d96ce..54a682e 100644
--- a/class/Search.php
+++ b/class/Search.php
@@ -4,20 +4,20 @@ class search {
 	
 	public function __construct($params){
 		echo '<center>
-<form method="get" action="http://www.google.fr/custom" target="_top" name="form" id="form">
-<table bgcolor="#ffffff" id="recherche">
-<tr><td nowrap="nowrap" valign="top" align="left" height="32">
-<input type="text" name="q" id="q" size="31" maxlength="255" value=""></input>
-<input type="submit" name="sa" value="Rechercher" class="searchbutton"></input>
-<input type="hidden" name="client" value="pub-5878090856826866"></input>
-<input type="hidden" name="forid" value="1"></input>
-<input type="hidden" name="ie" value="ISO-8859-1"></input>
-<input type="hidden" name="oe" value="ISO-8859-1"></input>
-<input type="hidden" name="cof" value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1;"></input>
-<input type="hidden" name="hl" value="fr"></input>
-</td></tr></table>
-</form>
-</center>';
+				<form method="get" action="http://www.google.fr/custom" target="_top" name="form" id="form">
+				<table bgcolor="#ffffff" id="recherche">
+				<tr><td nowrap="nowrap" valign="top" align="left" height="32">
+				<input type="text" name="q" id="q" size="31" maxlength="255" value=""></input>
+				<input type="submit" name="sa" value="Rechercher" class="searchbutton"></input>
+				<input type="hidden" name="client" value="pub-5878090856826866"></input>
+				<input type="hidden" name="forid" value="1"></input>
+				<input type="hidden" name="ie" value="ISO-8859-1"></input>
+				<input type="hidden" name="oe" value="ISO-8859-1"></input>
+				<input type="hidden" name="cof" 				value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1;"></input>
+				<input type="hidden" name="hl" value="fr"></input>
+				</td></tr></table>
+				</form>
+				</center>';
 	}
 	
 	private function setParams($params){
diff --git a/css/clock.css b/css/clock.css
index 02e79a9..4861532 100644
--- a/css/clock.css
+++ b/css/clock.css
@@ -15,7 +15,7 @@ float:left;
 .clock{
 
 	/* The .clock div. Created dynamically by jQuery */
-	background:url(../images/clock.png) top left no-repeat;
+	background:url(../images/interface/clock.png) top left no-repeat;
 	background-color:#FFF;
 
 	height:100px;
diff --git a/css/jquery.fancybox-1.3.0.css b/css/jquery.fancybox-1.3.0.css
index 9cd507e..5e1b5fb 100644
--- a/css/jquery.fancybox-1.3.0.css
+++ b/css/jquery.fancybox-1.3.0.css
@@ -39,7 +39,7 @@
 	left: 0;

 	width: 40px;

 	height: 480px;

-	background: transparent url('../images/fancy_loading.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_loading.png') no-repeat;

 }

 

 #fancybox-overlay {

@@ -110,7 +110,7 @@
 	right: -15px;

 	width: 32px;

 	height: 32px;

-	background: url('../images/fancy_close.png') top left no-repeat;

+	background: url('../images/fancy/fancy_close.png') top left no-repeat;

 	cursor: pointer;

 	z-index: 1103;

 	display: none;

@@ -177,7 +177,7 @@
 

 #fancybox-title-over {

 	padding: 10px;

-	background: url('../images/fancy_title_over.png');

+	background: url('../images/fancy/fancy_title_over.png');

 	display: block;

 }

 

@@ -192,19 +192,19 @@
 

 #fancybox-title-left {

 	padding-left: 15px;

-	background: transparent url('../images/fancy_title_left.png') repeat-x;

+	background: transparent url('../images/fancy/fancy_title_left.png') repeat-x;

 }

 

 #fancybox-title-main {

 	font-weight: bold;

 	line-height: 29px;

-	background: transparent url('../images/fancy_title_main.png') repeat-x;

+	background: transparent url('../images/fancy/fancy_title_main.png') repeat-x;

 	color: #FFF;

 }

 

 #fancybox-title-right {

 	padding-left: 15px;

-	background: transparent url('../images/fancy_title_right.png') repeat-x;

+	background: transparent url('../images/fancy/fancy_title_right.png') repeat-x;

 }

 

 #fancybox-left, #fancybox-right {

@@ -214,7 +214,7 @@
 	width: 35%;

 	cursor: pointer;

 	outline: none;

-	background-image: url('../images/blank.gif');

+	background-image: url('../images/fancy/blank.gif');

 	z-index: 1102;

 	display: none;

 }

@@ -240,11 +240,11 @@
 }

 

 #fancybox-left-ico {

-	background: transparent url('../images/fancy_nav_left.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_nav_left.png') no-repeat;

 }

 

 #fancybox-right-ico {

-	background: transparent url('../images/fancy_nav_right.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_nav_right.png') no-repeat;

 }

 

 #fancybox-left:hover, #fancybox-right:hover {

@@ -273,7 +273,7 @@ div#fancy-bg-n {
 	left: 0;

 	width: 100%;

 	height: 20px;

-	background: transparent url('../images/fancy_shadow_n.png') repeat-x;

+	background: transparent url('../images/fancy/fancy_shadow_n.png') repeat-x;

 }

 

 div#fancy-bg-ne {

@@ -281,7 +281,7 @@ div#fancy-bg-ne {
 	right: -20px;

 	width: 20px;

 	height: 20px;

-	background: transparent url('../images/fancy_shadow_ne.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_shadow_ne.png') no-repeat;

 }

 

 div#fancy-bg-e {

@@ -289,7 +289,7 @@ div#fancy-bg-e {
 	right: -20px;

 	height: 100%;

 	width: 20px;

-	background: transparent url('../images/fancy_shadow_e.png') repeat-y;

+	background: transparent url('../images/fancy/fancy_shadow_e.png') repeat-y;

 }

 

 div#fancy-bg-se {

@@ -297,7 +297,7 @@ div#fancy-bg-se {
 	right: -20px;

 	width: 20px;

 	height: 20px;

-	background: transparent url('../images/fancy_shadow_se.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_shadow_se.png') no-repeat;

 }

 

 div#fancy-bg-s {

@@ -313,7 +313,7 @@ div#fancy-bg-sw {
 	left: -20px;

 	width: 20px;

 	height: 20px;

-	background: transparent url('../images/fancy_shadow_sw.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_shadow_sw.png') no-repeat;

 }

 

 div#fancy-bg-w {

@@ -321,7 +321,7 @@ div#fancy-bg-w {
 	left: -20px;

 	height: 100%;

 	width: 20px;

-	background: transparent url('../images/fancy_shadow_w.png') repeat-y;

+	background: transparent url('../images/fancy/fancy_shadow_w.png') repeat-y;

 }

 

 div#fancy-bg-nw {

@@ -329,5 +329,5 @@ div#fancy-bg-nw {
 	left: -20px;

 	width: 20px;

 	height: 20px;

-	background: transparent url('../images/fancy_shadow_nw.png') no-repeat;

+	background: transparent url('../images/fancy/fancy_shadow_nw.png') no-repeat;

 }
diff --git a/css/main.css b/css/main.css
index 869aaf0..cfeee81 100644
--- a/css/main.css
+++ b/css/main.css
@@ -292,7 +292,7 @@ a.green-button,a.green-button:visited{
 	text-decoration:none;
 
 	text-shadow:1px 1px 1px #DDDDDD;
-	background:url(../images/button_green.png) no-repeat left top;
+	background:url(../images/interface/button_green.png) no-repeat left top;
 }
 
 a.green-button:hover{
@@ -300,7 +300,7 @@ a.green-button:hover{
 	background-position:left bottom;
 }
 
-	.jclock {position:absolute; top:10px; right:10px;z-index:500; width:200px;background:#fff url(../images/clock.png) top left no-repeat; padding:5px 0 0 5px; width:59px; height:21px;}
+	.jclock {position:absolute; top:10px; right:10px;z-index:500; width:200px;background:#fff url(../images/interface/clock.png) top left no-repeat; padding:5px 0 0 5px; width:59px; height:21px;}
 
 		
 	#blogs {/*position:absolute; bottom:10px; left: 100px;*/padding:5px;width:350px;-webkit-border-radius: 5px;
diff --git a/css/neige.css b/css/neige.css
index dd0f325..56eb631 100644
--- a/css/neige.css
+++ b/css/neige.css
@@ -1 +1 @@
-#weather .weatherpic{float:left; background:url(../images/pluie.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
+#weather .weatherpic{float:left; background:url(../images/weather/pluie.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
diff --git a/css/note.css b/css/note.css
index dcd6d57..2124335 100644
--- a/css/note.css
+++ b/css/note.css
@@ -62,7 +62,7 @@ span.data{ display:none; }
 	width:980px;
 	height:500px;
 	z-index:10;
-	background:url(../images/add_a_note_help.gif) no-repeat left top;
+	/*background:url(../images/add_a_note_help.gif) no-repeat left top;*/
 }
 
 h3.popupTitle{
@@ -112,7 +112,7 @@ h3.popupTitle{
 }
 
 #note-submit{	margin:20px auto; }
-.delete {display:none; height:16px; width:16px; background:url(../images/delete.png) top left no-repeat; position:absolute; top:5px; right:5px; z-index:9999;}
+.delete {display:none; height:16px; width:16px; background:url(../images/interface/delete.png) top left no-repeat; position:absolute; top:5px; right:5px; z-index:9999;}
 .delete:hover{cursor:pointer !important;}
 
 
diff --git a/css/nuage.css b/css/nuage.css
index 6321b61..2ddabb6 100644
--- a/css/nuage.css
+++ b/css/nuage.css
@@ -1 +1 @@
-#weather .weatherpic{float:left; background:url(../images/nuage.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
+#weather .weatherpic{float:left; background:url(../images/weather/nuage.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
diff --git a/css/peunuage.css b/css/peunuage.css
index 260b045..3fc6c72 100644
--- a/css/peunuage.css
+++ b/css/peunuage.css
@@ -1 +1 @@
-#weather .weatherpic{float:left; background:url(../images/peu-nuageux.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
+#weather .weatherpic{float:left; background:url(../images/weather/peu-nuageux.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
diff --git a/css/pluie.css b/css/pluie.css
index dd0f325..56eb631 100644
--- a/css/pluie.css
+++ b/css/pluie.css
@@ -1 +1 @@
-#weather .weatherpic{float:left; background:url(../images/pluie.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
+#weather .weatherpic{float:left; background:url(../images/weather/pluie.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
diff --git a/css/soleil.css b/css/soleil.css
index 5979def..36f2704 100644
--- a/css/soleil.css
+++ b/css/soleil.css
@@ -1 +1 @@
-#weather .weatherpic{float:left; background:url(../images/soleil.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
+#weather .weatherpic{float:left; background:url(../images/weather/soleil.png) top left no-repeat; width:53px; height:53px; margin-right:10px;}
diff --git a/index.php b/index.php
index 72eb410..91c61cb 100644
--- a/index.php
+++ b/index.php
@@ -73,42 +73,42 @@ if($config = simplexml_load_file('db/config.xml')){
 	<div class="appscontainer"> 
 		<span class="label">Google Apps</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://mail.google.com" onclick="spawnLink(this);return false;"><img src="images/gmail_128.png" /><br>Gmail</a></li> 
-			<li class="item"><a href="http://mail.live.com" onclick="spawnLink(this);return false;"><img src="images/mail-msn.png" /><br>Hotmail</a></li> 
-			<li class="item"><a href="http://mail1.voila.fr/webmail/fr_FR/login.html" onclick="spawnLink(this);return false;"><img src="images/voila.png" /><br>Voila.fr mail</a></li> 
-			<li class="item"><a href="http://calendar.google.com" onclick="spawnLink(this);return false;"><img src="images/calendar_128.png" /><br>Google&nbsp;Calendar</a></li> 
-			<li class="item"><a href="http://reader.google.com" onclick="spawnLink(this);return false;"><img src="images/reader_128.png" /><br>Google Reader</a></li>
-			<li class="item"><a href="http://docs.google.com" onclick="return spawnLink(this);"><img src="images/docs_128.png" /><br>Google Docs</a></li> 
+			<li class="item"><a href="http://mail.google.com" onclick="spawnLink(this);return false;"><img src="images/links/gmail_128.png" /><br>Gmail</a></li> 
+			<li class="item"><a href="http://mail.live.com" onclick="spawnLink(this);return false;"><img src="images/links/mail-msn.png" /><br>Hotmail</a></li> 
+			<li class="item"><a href="http://mail1.voila.fr/webmail/fr_FR/login.html" onclick="spawnLink(this);return false;"><img src="images/links/voila.png" /><br>Voila.fr mail</a></li> 
+			<li class="item"><a href="http://calendar.google.com" onclick="spawnLink(this);return false;"><img src="images/links/calendar_128.png" /><br>Google&nbsp;Calendar</a></li> 
+			<li class="item"><a href="http://reader.google.com" onclick="spawnLink(this);return false;"><img src="images/links/reader_128.png" /><br>Google Reader</a></li>
+			<li class="item"><a href="http://docs.google.com" onclick="return spawnLink(this);"><img src="images/links/docs_128.png" /><br>Google Docs</a></li> 
 		</ul> 
 		<hr> 
  
 		<span class="label">Media</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://youtube.com" onclick="spawnLink(this);return false;"><img src="images/youtube_128.png" /><br>YouTube</a></li> 
-			<li class="item"><a href="http://picasaweb.com" onclick="spawnLink(this);return false;"><img src="images/picasaweb_128.png" /><br>PicasaWeb</a></li> 
-			<li class="item"><a href="http://www.netvibes.com" onclick="spawnLink(this);return false;"><img src="images/netvibes.png" /><br>Netvibes</a></li> 
-			<li class="item"><a href="http://www.deviantart.com" onclick="spawnLink(this);return false;"><img src="images/deviantART128.png" /><br>DeviantArt</a></li>
-			<li class="item"><a href="https://www.labanquepostale.fr/index.html" onclick="spawnLink(this);return false;"><img src="images/banquepostale.png" /><br>Banque 1</a></li>
-			<li class="item"><a href="http://www.societegenerale.fr/" onclick="spawnLink(this);return false;"><img src="images/societegenerale.png" /><br>Banque 2</a></li>			
+			<li class="item"><a href="http://youtube.com" onclick="spawnLink(this);return false;"><img src="images/links/youtube_128.png" /><br>YouTube</a></li> 
+			<li class="item"><a href="http://picasaweb.com" onclick="spawnLink(this);return false;"><img src="images/links/picasaweb_128.png" /><br>PicasaWeb</a></li> 
+			<li class="item"><a href="http://www.netvibes.com" onclick="spawnLink(this);return false;"><img src="images/links/netvibes.png" /><br>Netvibes</a></li> 
+			<li class="item"><a href="http://www.deviantart.com" onclick="spawnLink(this);return false;"><img src="images/links/deviantART128.png" /><br>DeviantArt</a></li>
+			<li class="item"><a href="https://www.labanquepostale.fr/index.html" onclick="spawnLink(this);return false;"><img src="images/links/banquepostale.png" /><br>Banque 1</a></li>
+			<li class="item"><a href="http://www.societegenerale.fr/" onclick="spawnLink(this);return false;"><img src="images/links/societegenerale.png" /><br>Banque 2</a></li>			
 		</ul> 
 		<hr> 
  
 		<span class="label">Desk Accessories</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="javascript: openContactList()" ><img src="images/contacts.png" /><br>Contacts</a></li> 
-			<li class="item"><a href="javascript: openCalculator();"><img src="images/calculator.png" width="16" height="16" /><br>Calculator</a></li> 
-			<li class="item"><a href="javascript: openTodo();"><img src="images/tasks.png" width="16" height="16" /><br>To-do list</a></li> 
-			<li class="item"><a href="javascript: openCalendar();"><img src="images/calendar_128.png" width="16" height="16" /><br>Calendar Panel</a></li> 
-            <li class="item"><a href="javascript: openNotepad();"><img src="images/notepad.png" width="16" height="16" /><br>NotePad</a></li>
+			<li class="item"><a href="javascript: openContactList()" ><img src="images/links/contacts.png" /><br>Contacts</a></li> 
+			<li class="item"><a href="javascript: openCalculator();"><img src="images/links/calculator.png" width="16" height="16" /><br>Calculator</a></li> 
+			<li class="item"><a href="javascript: openTodo();"><img src="images/links/tasks.png" width="16" height="16" /><br>To-do list</a></li> 
+			<li class="item"><a href="javascript: openCalendar();"><img src="images/links/calendar_128.png" width="16" height="16" /><br>Calendar Panel</a></li> 
+            <li class="item"><a href="javascript: openNotepad();"><img src="images/links/notepad.png" width="16" height="16" /><br>NotePad</a></li>
 		</ul> 
 		<hr> 
  
 		<span class="label">Entertainment</span> 
 		<ul class="iconlist"> 
-			<li class="item"><a href="http://facebook.com" onclick="spawnLink(this);return false;"><img src="images/facebook.png" /><br>Facebook</a></li> 
-			<li class="item"><a href="http://twitter.com" onclick="spawnLink(this);return false;"><img src="images/twitter.png" />Twitter</a></li> 
-			<li class="item"><a href="http://fr.vente-privee.com/" onclick="spawnLink(this);return false;"><img src="images/vp128.png" />Ventes Privées</a></li>
-			<li class="item"><a href="http://www.google.fr/movies" onclick="spawnLink(this);return false;"><img src="images/Gmovie.png" />Horaires Ciné</a></li>			
+			<li class="item"><a href="http://facebook.com" onclick="spawnLink(this);return false;"><img src="images/links/facebook.png" /><br>Facebook</a></li> 
+			<li class="item"><a href="http://twitter.com" onclick="spawnLink(this);return false;"><img src="images/links/twitter.png" />Twitter</a></li> 
+			<li class="item"><a href="http://fr.vente-privee.com/" onclick="spawnLink(this);return false;"><img src="images/links/vp128.png" />Ventes Privées</a></li>
+			<li class="item"><a href="http://www.google.fr/movies" onclick="spawnLink(this);return false;"><img src="images/links/Gmovie.png" />Horaires Ciné</a></li>			
 			
 		</ul> 
 		<hr> 
@@ -139,7 +139,7 @@ if($config = simplexml_load_file('db/config.xml')){
 		<ul>
 		<?$blogs = new Blogs_last_post();
 			foreach($blogs->getLinks() as $link)
-				echo '<li>'.$link['url'].' <img src="images/delete.png" id="link-'.$link['name'].'"/></li>';?>
+				echo '<li>'.$link['url'].' <img src="images/interface/delete.png" id="link-'.$link['name'].'"/></li>';?>
 		</ul>
 		<h4>Insert Site feed</h4>
 		<form action="addSite.php" method="POST">
diff --git a/js/getUncompletedTasks.php b/js/getUncompletedTasks.php
index 3688448..f7b465d 100644
--- a/js/getUncompletedTasks.php
+++ b/js/getUncompletedTasks.php
@@ -6,16 +6,16 @@ function cbfunc(o){
 	$('#results').append('<ul id="uncompletedList"><ul>');

 	for(var i in o)

 	{

-		$('#uncompletedList').append('<li id="'+o[i].id+'">'+o[i].content+' - '+o[i].date_string+' <img src="images/delete.png" class="deleteTask" id="delete-'+o[i].id+'"/> <img src="images/complete.png" class="completeTask" id="complete-'+o[i].id+'"/> </li>');

+		$('#uncompletedList').append('<li id="'+o[i].id+'">'+o[i].content+' - '+o[i].date_string+' <img src="images/interface/delete.png" class="deleteTask" id="delete-'+o[i].id+'"/> <img src="images/interface/complete.png" class="completeTask" id="complete-'+o[i].id+'"/> </li>');

 	}

 }

 

 function cbfunc2(o){

-	$('#uncompletedList').append('<li id="'+o.id+'">'+o.content+' - '+o.date_string+' <img src="images/delete.png" id="delete-'+o.id+'"/> <img src="images/complete.png" class="completeTask" id="complete-'+o.id+'"/> </li>');

+	$('#uncompletedList').append('<li id="'+o.id+'">'+o.content+' - '+o.date_string+' <img src="images/interface/delete.png" id="delete-'+o.id+'"/> <img src="images/interface/complete.png" class="completeTask" id="complete-'+o.id+'"/> </li>');

 }

 		

 $(document).ready(function(){

-	$('#todoList').append('<div id="results"></div><img src="images/add.png" id="showNewTask"/><fieldset id="newTaskFieldset" style="display:none; width:200px;"><input type="text" name="newtask" id="newtask"/> <select id="priority"><option id="1" value="1">1</option><option id="2" value="2">2</option><option id="3" value="3">3</option><option id="4" value="4">4</option></select> <br/><input type="text" name="date_string" id="date_string"/>  <img src="images/add.png" id="addTask"/></fieldset>');

+	$('#todoList').append('<div id="results"></div><img src="images/interface/add.png" id="showNewTask"/><fieldset id="newTaskFieldset" style="display:none; width:200px;"><input type="text" name="newtask" id="newtask"/> <select id="priority"><option id="1" value="1">1</option><option id="2" value="2">2</option><option id="3" value="3">3</option><option id="4" value="4">4</option></select> <br/><input type="text" name="date_string" id="date_string"/>  <img src="images/interface/add.png" id="addTask"/></fieldset>');

 	var token = "<?=$token?>";

 	var project_id = "<?=$id?>";

 	var script = document.createElement('script');

diff --git a/js/jquery.blogs.js b/js/jquery.blogs.js
index e6bcda0..24f2ffc 100644
--- a/js/jquery.blogs.js
+++ b/js/jquery.blogs.js
@@ -22,7 +22,7 @@ function make_draggable(elements)
 	
 //affichage des blogs
 $('body').append('<div id="blogs"></div>');
-$("#blogs").html("<img src=\"images/ajax_load.gif\"/> Loading Blogs...");
+$("#blogs").html("<img src=\"images/interface/ajax_load.gif\"/> Loading Blogs...");
 var tmp;
 
 /* A helper function for converting a set of elements to draggables: */
diff --git a/js/jquery.notes.js b/js/jquery.notes.js
index 692a4fd..a0fcba5 100644
--- a/js/jquery.notes.js
+++ b/js/jquery.notes.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
 //click sur delete
 	$('.delete').click(function(){
 		var data2 = {'id' : $(this).attr("id")};
-		$(this).replaceWith('<img src="images/ajax_load.gif" style="display:block" />');
+		$(this).replaceWith('<img src="images/interface/ajax_load.gif" style="display:block" />');
 		/* Sending an AJAX POST request: */
 		$.post('ajax/delete-notes.php',data2,function(msg2){
 			if(parseInt(msg2))
@@ -78,7 +78,7 @@ $(document).ready(function(){
 			return false;
 		}*/
 
-		$(this).replaceWith('<img src="images/ajax_load.gif" style="margin:30px auto;display:block" />');
+		$(this).replaceWith('<img src="images/interface/ajax_load.gif" style="margin:30px auto;display:block" />');
 
 		var data = {
 			'zindex'	: ++zIndex,
diff --git a/js/main.js b/js/main.js
index 13c67d1..f11c00a 100644
--- a/js/main.js
+++ b/js/main.js
@@ -55,7 +55,7 @@ $(document).ready(function(){
 		'padding'			: 15
 	});
 	$('#config-submit').live('click',function(e){
-		$(this).replaceWith('<img src="images/ajax_load.gif" style="margin:30px auto;display:block" />');
+		$(this).replaceWith('<img src="images/interface/ajax_load.gif" style="margin:30px auto;display:block" />');
 		var data3 = {
 			'clock' 	: $('input[type=radio][name=clock_group]:checked').attr('value'),
 			'meteo'		: $('input[type=radio][name=meteo_group]:checked').attr('value'),