Update and rename AbstractGeometricalForm to AbstractGeometricalForm.java