Simplify user avatars folder structure