Added separated server and client files