Ransac class re-organization almost completed