move constant to correct calss