Moved site/server config back into it's own json file