Renamed package types -> model
Renamed package views -> view