Updated libraries to have classes - part 3.