Update content structure

Antonelarequested to merge
antonela/dev:master into staging

Based on our discussion with devs in #6 (closed), I'm pushing the new content structure.

Merge request reports