Move content related classes out of proxy/hosted repo specific packages