Only a few more library files to fully convert to class format