Revert "Client merged with Server Yeeeeeeee"

This reverts commit f295682a28a5696d0df50454859149daf4bacdf0.