Update CoFHCore/Lib and fix broken imports due to refactoring upstream

There was some refactoring and repackaging with CoFHCore/Lib, so the broken
imports had to be fixed.