Reorganized files into server folder