Moved paint stuff to its own package