Revert "Split Server/Client folders"

This reverts commit 7bcca1f138b199c7b508e5c4b7b908d849fb8ab7.