Tidy up on content addons, so that would be easier to add new addons in the future
Merge pull request #163 from lyncodev/addon-tidy-up

Tidy up on content addons, so then will be easier to add new addons...