CL-22 : continue create model-view structure