Rebuilt site with a simpler architecture