Moved global constants into class constants and updated all references
Docblock fix
Merge pull request #523 from cnelissen/FilePackageConstantsFix

File package constants fix

* cnelissen/FilePackageConstantsFix:
  Docblock fix
  Moved global constants into class constants and updated all references