v0.1.3 Model and views sturcture updated