Refactoring (Seeming to work)

Tried to refactor around a bit. Clientside now has a Peer too.
Encryption is almost working now too.