Changed constants to CONST class and moved constant to utilities.util