Work on baking the Sites module into the Phire 2 core