Moved what will be common constants out into their own class and the
necessary refactoring that goes along with it.