Update file names and functionality.
Update class list with new threads