Renamed

So can merge changes without overwriting each other's void draw and
setup. I will do this for each file.