added geometry related classes to seperate file