Refactor site configuration