Moved util files into master_src