Rewrote the server code to Peer Discovery

- Also removed redundant classes for now