Merge !1246

Roadmap: new structure

Closes #1057, #1067, and #1070

See merge request !1246
1 job for master
Status Job ID Name Coverage
  Build
canceled #1229
build_site