Content updates

Reorganization of some content, addition of stores