Add CONFIGDIR constant and remove old CONSTANT