added uml raw files
fixed merge problem in constants