Server: Splitting files, Fixed Warnings, ..

See Commit comments.

The file structure makes a bit more sense now IMHO.