[Git][ghc/ghc][wip/fix-26670] A very untidy, partial reorganization [DOES NOT COMPILE]