Moved library and testUtility to lib and tools, respectively