Reorganized files to separate client from server