Refactor to prepare new sites from issue #1.