Reorganize server setup code (including changed macros). Remove indirect server config, start working on https.