Moved constant classes out of util