Bug fixes and reorganization of ContentRepository to enable external content provisioning