Draw the points inside the donut and reorganize the files a bit