Refactored Scene Objects - subfolders