Handle new directory structure

OS have changed the Codepoint directory layout. A better fix would have better heuristics for finding file locations.