Added separate server and client files