restructuring completed.TODO:Model Project can be saparated