Structural changes getting ready for more features in the future

git-svn-id: https://plugins.svn.wordpress.org/demandbase-content-module/trunk@964145 b8457f37-d9ea-0310-8a92-e5e31aec5664