Apply `site` naming schema where using `blog`. Reorder some network function logic