Now, should I change everything to a WorkGroup Environment?
I believe it's already in a Workgroup if it's not in an AD. Right click [My Computer] => [Properties]. Click the [Computer Name] tab and you'll see the Workgroup name. You can change it from there. (Not assuming that you don't know this, but just in case )