Conic section code + reorganization