Moving blocksources out of util to the top level