Move renderer into separate file as well