move module constants into class
Merge commit '0ecc3497991d9b71aa1ae32d7da44e3bb3c61c83' into test