refactoring to scene-list to work with other changes
Merge branch 'refactoring-scene-list' into dev