Move some files into utilities folder

Change-Id: I8841a919548ff76a05912216d640088ecd83c39c