Split Builder Classes

Split up the functions from the Builder classes to only group the ones
linked to the same request type, to keep it simpler.