Merge "Restructure for authorative models"