Revert "Client and Common and server files"

This reverts commit b2dfbf1ae12e8efc70bea07c6b6fee68abfc591c.
Revert "Revert "Client and Common and server files""

This reverts commit b4f9cb917b7d7dd9d81d36c6161c17f068bac029.
Revert "Revert "Revert "Client and Common and server files"""

This reverts commit 0c4307e93695c7c72c20f471e7019e4abe670495.