added errors, reorg of naming, added server