Move views to separate files