Rearranged code to split the various types of curve creators into separate headers.