Feature/consolidate constants

* Grouped constants by class
* Updated references to constants