Refactored website structure