Major changes to file names (removed "server" prefix).