Move some enums to Scene