Move ContentView to separate file