Move views into separate views/ directory