Update Model and move to its own project