Initial work on moving server related code to server project