Did major refactoring. Also deprecated old server