Reorganized files / folder and separated view / model