Organization with Page Components - Refactoring to Pages