Refactor GHC/user packages, move builder-specific functions into Builder