System Folders

I have a new Dell laptop with 2 partitions, which were set up at my request in the factory (ignoring the Recovery partition E:\), thus I have C: which I have called System and D: which I renamed to Data. Now guess what: I want my data in the Data partition. So I moved a whole lot of folders from C:\Users\John to D:\John. That suitably stuffed up my Favorites which I think I have fixed using Regedit.

But now when I open explorer (if it's still called that) the folder tree on the left goes Desktop then John, then a whole lot of folders within John which are all duplicated, some in normal yellow/beige folder colour and alternately in the system blue colour. These folders have desktop.ini files in them.

Basically, I want system folders in the C:\ or System partition and data folders in the Data partition, especially large folders such as music and pictures. I also want my folder tree to look simple and not like the dog's breakfast that it has become.

How do I organise Windows to recognise folders as system folders, in that blue colour, without duplications? Do I play around with destop.ini files or using Regedit? Does Windows have a simple way of organising these folders without resorting to regedit? Or is there a simple utility that does this? I want to set up Documents, Music, Videos and Pictures on the D: partition with Favorites etc remaining on the C: partition. Or should I set up a shortcut in each system folder in the C: drive that points to similar folders on the D: drive? I have done this sort of thing on my desktop computer.

I did manage to fix the Favorites problem with Regedit. What I did do though, was to create a restore point before playing with regedit. Is this the best way, or is it better to back up the registry? Or another method?

Maybe this question will stimulate a few different opinions.

Thanks

John