use path::class, avoid egrep and $^X
removed diag
preserve older behavior
updated meta files