MADS: Starting to refactor some Scene array fields as separate classes