All constants and messages moved to constants in 1 module