Here's what you should do
1) Select all the folders in your Users folder, and drag them to your desktop
2) Your users folder should now be empty
3) Log out, log in
4) Look in your users folder, it should now contain a single folder
5) Copy all your files from the folder on your desktop the appropriate places in your user folder.
1) Select all the folders in your Users folder, and drag them to your desktop
2) Your users folder should now be empty
3) Log out, log in
4) Look in your users folder, it should now contain a single folder
5) Copy all your files from the folder on your desktop the appropriate places in your user folder.