cleanup old websockets stuff
merge
refactor wrap-reload, add server restart fn
Merge pull request #32 from DarMontou/server

Refactor Server