Moved server related code to own dir
Getting the server working again