Now views are put in more appropriate place.