move geometry in separates class