Site refactor