Server code is now in it's own files
Client code now in networking
Client code now in networking
Fixed Merge Conflict