Bump master to 9.0
Rename files to reflect class name