Restructed the models