Re-organize avatars file