Vista - reapeated desktop file

Hi, I am using Windows Vista RC1 64-bit edition. I am trying to move my
personal files to where they are stored on a non-boot hard drive (I know that
this can be done in XP) somewhere allong the line I really goofed up and so I
decided to get things back the way they were. I have everything back now
exept that the "Desktop" folder is reapeated (there are two of the same
folder) and when I delete one it deletes both of them and if I leave it like
this when I restart they are both back. I only want there to be one "Desktop"
file. Also, there was a text file that kept showing up. I deleted it and now
when I expand the "John" flolder it shows a text document but there is not
one there and the properties of the icon confirm this but it cannot be
deleted. Does anyone know how to fix this?