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

...the future