Refactored site structure