Scene Component Refactor