Update of vs solution to include new server folder