added geometry file and moved geometry code to it