More work on server stuff, including renaming of /icons to /icon