moved points out of shapes into its own file