Moved ResultBuilder out into its own file
3 files changed