Moved constants to new file