Moved constants to its own package