Make models and controllers structure consistent