Move overlapping discs to proper folder and add test code