New geometry class organization