Claus corrected something
Program structure for server
Merge