Site configuration refactoring