Move Builder class into its own file