Refactored Scene files