Moving models and views to separate files