Added some more CGPoint functions, split classes out