This is a significant overhaul to make it possible to serve totally different templates with different components for the different sites.