Q: iCloud Desktop sync problem

I enabled desktop and document syncing on my sierra iMac and it moved all my desktop files into a folder named Desktop - xxx's iMac. I didn't want them in a separate folder. That's why I had them on my desktop! I took the files out of that folder and put them back on the desktop then deleted the Desktop - xxx's iMac folder. Can't remember what else I did but it has all been going swimmingly with my desktop files where they're supposed to be and on the iCloud Drive they are in a folder named Desktop - xxx's iMac. Today I updated my laptop to Sierra and all my iMac desktop files filled my laptop desktop and all my laptop desktop files were moved to a folder named Desktop - xxx's MacBook. It should be the other way around as far as I'm concerned. I'd like my laptop to have it's own desktop files on the desktop along with a folder for my iMac's desktop and my iMac to have it's own desktop files on the desktop along with a folder for my Laptop's desktop Any ideas how to fix?