One the whole nothing major has changed, but I think this makes things more logical. I just hope its stable, since I'm releasing a new tag.
I've created a separate branch for this because it's gonna be a bitch to get compiled, and then I'll still have to ensure that the client & server are work together correctly. This build does not compile.