revised file structure after merge. Added changes to bcd_ostr