added server timeout on socets
added new server parameter
server updated
removed extra files
merged