Require components and scenes folders
Merge branch 'require-components-scenes'