Restructuring of slides module
Merge branch 'master' into eve