improve client and server files organization