Revert "Revert "Split Server/Client folders""

This reverts commit a0fe4509cf0ee2f5f42e43158b31cee59a8d6684.
Revert "Revert "Revert "Split Server/Client folders"""

This reverts commit e8b9d76c1b675aa4e550cc2ec73b5cecd51a4ab8.