@andrewrk what about "lib" and "util"?