updated server files, rearranged client files