More entity/scene refactoring