site structure refactoring