TP 30007 Refacotr ContentMgr

@texasag @kevinsproles @tsanko @prabinv 
Please code review and pull into sprint7

Along with this PR: