Revert "Created Client and Server folders"

This reverts commit 8c0527ef25dc9fa4a31dbf1e0fbafe5fe0709f24.