More work on the new site structure