1) Changed some includes
2) Moved some functionality for scene painting