Moved UT headers to lib dir