Improve handling of invalid
Part 10 files; restructure build to get latest CTP & util