Restructured Filed based on "client" and "server"