moved server files into server folder