diff --git a/classes/modules/blog/entity/Blog.entity.class.php b/classes/modules/blog/entity/Blog.entity.class.php
index 1e3aca24..c0dbc2cb 100644
--- a/classes/modules/blog/entity/Blog.entity.class.php
+++ b/classes/modules/blog/entity/Blog.entity.class.php
@@ -178,7 +178,7 @@ class ModuleBlog_EntityBlog extends Entity {
 		if ($sPath=$this->getAvatar()) {
 			return preg_replace("#_\d{1,3}x\d{1,3}(\.\w{3,4})$#", ((($iSize==0)?"":"_{$iSize}x{$iSize}") . "\\1"),$sPath);
 		} else {
-			return Config::Get('path.static.skin').'/images/avatar_blog_'.$iSize.'x'.$iSize.'.png';
+			return Config::Get('path.static.skin').'/images/avatars/avatar_blog_'.$iSize.'x'.$iSize.'.png';
 		}
 	}
 	/**
diff --git a/classes/modules/user/entity/User.entity.class.php b/classes/modules/user/entity/User.entity.class.php
index a1f0d356..15c42fc9 100644
--- a/classes/modules/user/entity/User.entity.class.php
+++ b/classes/modules/user/entity/User.entity.class.php
@@ -366,7 +366,7 @@ class ModuleUser_EntityUser extends Entity {
 		if ($sPath=$this->getProfileAvatar()) {
 			return str_replace('_100x100',(($iSize==0)?"":"_{$iSize}x{$iSize}"),$sPath."?".date('His',strtotime($this->getProfileDate())));
 		} else {
-			return Config::Get('path.static.skin').'/images/avatar_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'_'.$iSize.'x'.$iSize.'.png';
+			return Config::Get('path.static.skin').'/images/avatars/avatar_'.($this->getProfileSex()=='woman' ? 'female' : 'male').'_'.$iSize.'x'.$iSize.'.png';
 		}
 	}
 	/**
diff --git a/templates/skin/developer/images/avatar_blog_100x100.png b/templates/skin/developer/images/avatars/avatar_blog_100x100.png
similarity index 100%
rename from templates/skin/developer/images/avatar_blog_100x100.png
rename to templates/skin/developer/images/avatars/avatar_blog_100x100.png
diff --git a/templates/skin/developer/images/avatar_blog_24x24.png b/templates/skin/developer/images/avatars/avatar_blog_24x24.png
similarity index 100%
rename from templates/skin/developer/images/avatar_blog_24x24.png
rename to templates/skin/developer/images/avatars/avatar_blog_24x24.png
diff --git a/templates/skin/developer/images/avatar_blog_48x48.png b/templates/skin/developer/images/avatars/avatar_blog_48x48.png
similarity index 100%
rename from templates/skin/developer/images/avatar_blog_48x48.png
rename to templates/skin/developer/images/avatars/avatar_blog_48x48.png
diff --git a/templates/skin/developer/images/avatar_blog_64x64.png b/templates/skin/developer/images/avatars/avatar_blog_64x64.png
similarity index 100%
rename from templates/skin/developer/images/avatar_blog_64x64.png
rename to templates/skin/developer/images/avatars/avatar_blog_64x64.png
diff --git a/templates/skin/developer/images/avatar_female_100x100.png b/templates/skin/developer/images/avatars/avatar_female_100x100.png
similarity index 100%
rename from templates/skin/developer/images/avatar_female_100x100.png
rename to templates/skin/developer/images/avatars/avatar_female_100x100.png
diff --git a/templates/skin/developer/images/avatar_female_24x24.png b/templates/skin/developer/images/avatars/avatar_female_24x24.png
similarity index 100%
rename from templates/skin/developer/images/avatar_female_24x24.png
rename to templates/skin/developer/images/avatars/avatar_female_24x24.png
diff --git a/templates/skin/developer/images/avatar_female_48x48.png b/templates/skin/developer/images/avatars/avatar_female_48x48.png
similarity index 100%
rename from templates/skin/developer/images/avatar_female_48x48.png
rename to templates/skin/developer/images/avatars/avatar_female_48x48.png
diff --git a/templates/skin/developer/images/avatar_female_64x64.png b/templates/skin/developer/images/avatars/avatar_female_64x64.png
similarity index 100%
rename from templates/skin/developer/images/avatar_female_64x64.png
rename to templates/skin/developer/images/avatars/avatar_female_64x64.png
diff --git a/templates/skin/developer/images/avatar_male_100x100.png b/templates/skin/developer/images/avatars/avatar_male_100x100.png
similarity index 100%
rename from templates/skin/developer/images/avatar_male_100x100.png
rename to templates/skin/developer/images/avatars/avatar_male_100x100.png
diff --git a/templates/skin/developer/images/avatar_male_24x24.png b/templates/skin/developer/images/avatars/avatar_male_24x24.png
similarity index 100%
rename from templates/skin/developer/images/avatar_male_24x24.png
rename to templates/skin/developer/images/avatars/avatar_male_24x24.png
diff --git a/templates/skin/developer/images/avatar_male_48x48.png b/templates/skin/developer/images/avatars/avatar_male_48x48.png
similarity index 100%
rename from templates/skin/developer/images/avatar_male_48x48.png
rename to templates/skin/developer/images/avatars/avatar_male_48x48.png
diff --git a/templates/skin/developer/images/avatar_male_64x64.png b/templates/skin/developer/images/avatars/avatar_male_64x64.png
similarity index 100%
rename from templates/skin/developer/images/avatar_male_64x64.png
rename to templates/skin/developer/images/avatars/avatar_male_64x64.png
diff --git a/templates/skin/synio/images/avatar_blog_100x100.png b/templates/skin/synio/images/avatars/avatar_blog_100x100.png
similarity index 100%
rename from templates/skin/synio/images/avatar_blog_100x100.png
rename to templates/skin/synio/images/avatars/avatar_blog_100x100.png
diff --git a/templates/skin/synio/images/avatar_blog_24x24.png b/templates/skin/synio/images/avatars/avatar_blog_24x24.png
similarity index 100%
rename from templates/skin/synio/images/avatar_blog_24x24.png
rename to templates/skin/synio/images/avatars/avatar_blog_24x24.png
diff --git a/templates/skin/synio/images/avatar_blog_48x48.png b/templates/skin/synio/images/avatars/avatar_blog_48x48.png
similarity index 100%
rename from templates/skin/synio/images/avatar_blog_48x48.png
rename to templates/skin/synio/images/avatars/avatar_blog_48x48.png
diff --git a/templates/skin/synio/images/avatar_blog_64x64.png b/templates/skin/synio/images/avatars/avatar_blog_64x64.png
similarity index 100%
rename from templates/skin/synio/images/avatar_blog_64x64.png
rename to templates/skin/synio/images/avatars/avatar_blog_64x64.png
diff --git a/templates/skin/synio/images/avatar_female_100x100.png b/templates/skin/synio/images/avatars/avatar_female_100x100.png
similarity index 100%
rename from templates/skin/synio/images/avatar_female_100x100.png
rename to templates/skin/synio/images/avatars/avatar_female_100x100.png
diff --git a/templates/skin/synio/images/avatar_female_24x24.png b/templates/skin/synio/images/avatars/avatar_female_24x24.png
similarity index 100%
rename from templates/skin/synio/images/avatar_female_24x24.png
rename to templates/skin/synio/images/avatars/avatar_female_24x24.png
diff --git a/templates/skin/synio/images/avatar_female_48x48.png b/templates/skin/synio/images/avatars/avatar_female_48x48.png
similarity index 100%
rename from templates/skin/synio/images/avatar_female_48x48.png
rename to templates/skin/synio/images/avatars/avatar_female_48x48.png
diff --git a/templates/skin/synio/images/avatar_female_64x64.png b/templates/skin/synio/images/avatars/avatar_female_64x64.png
similarity index 100%
rename from templates/skin/synio/images/avatar_female_64x64.png
rename to templates/skin/synio/images/avatars/avatar_female_64x64.png
diff --git a/templates/skin/synio/images/avatar_male_100x100.png b/templates/skin/synio/images/avatars/avatar_male_100x100.png
similarity index 100%
rename from templates/skin/synio/images/avatar_male_100x100.png
rename to templates/skin/synio/images/avatars/avatar_male_100x100.png
diff --git a/templates/skin/synio/images/avatar_male_24x24.png b/templates/skin/synio/images/avatars/avatar_male_24x24.png
similarity index 100%
rename from templates/skin/synio/images/avatar_male_24x24.png
rename to templates/skin/synio/images/avatars/avatar_male_24x24.png
diff --git a/templates/skin/synio/images/avatar_male_48x48.png b/templates/skin/synio/images/avatars/avatar_male_48x48.png
similarity index 100%
rename from templates/skin/synio/images/avatar_male_48x48.png
rename to templates/skin/synio/images/avatars/avatar_male_48x48.png
diff --git a/templates/skin/synio/images/avatar_male_64x64.png b/templates/skin/synio/images/avatars/avatar_male_64x64.png
similarity index 100%
rename from templates/skin/synio/images/avatar_male_64x64.png
rename to templates/skin/synio/images/avatars/avatar_male_64x64.png