Move models and views to separate files