Moved standard setup scripts to directory to avoid merge conflicts with scripts when people change it with their own settings. Also fixed some residual merge things in UDPUser.