Reorganized folder
remove server