Started adding references to tools/libs