Moved some constants to the correct file.