Grouped constants by class
Updated references to constants
Merge pull request #25 from FenrirUnbound/feature/consolidate-constants

Feature/consolidate constants