Moved server related code to the server manifest