Reorganise GHC packages, get rid of Builder import cycle (#662)

Authored by snowleopard on Aug 27 2018, 3:45 PM.