Refactoring the site