Adding C4Ellipse, removing Ellipse.swift