Partial refactoring - changing some more stuff to store package, and keeping up with the mixed sites model, for now, lpeu and slides.