Added two modules for server and client