Simplify folder hierarchy#17

macolo wants to merge 3 commits intodjango-cms:5.0django-cms/cms-template:5.0from

macolo:5.0macolo/cms-template:5.0Copy head branch name to clipboard