Moved some geometric primitives in their own file