Fixed the class definitions and FileLibrary parameter's class name
Merge pull request #262 from xi-project/classname-fixes

Fixed the class definitions and FileLibrary parameter's class name