Moved constants.java to main package