restructured tree to add server
server draft without connections